* Re: mmotm 2008-12-11-19-42 uploaded (watchdog lib?)
2008-12-13 2:12 ` mmotm 2008-12-11-19-42 uploaded (watchdog lib?) Randy Dunlap
@ 2008-12-13 6:11 ` KAMEZAWA Hiroyuki
0 siblings, 0 replies; 2+ messages in thread
From: KAMEZAWA Hiroyuki @ 2008-12-13 6:11 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-kernel, akpm, damm
On Fri, 12 Dec 2008 18:12:12 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:
> akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2008-12-11-19-42 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
> >
> > It contains the following patches against 2.6.28-rc8:
>
>
> All of my mmotm-2008-1211-1942 builds end with:
>
> kernel/time/clocksource.c:108: error: too few arguments to function 'watchdog->read'
> kernel/time/clocksource.c:113: error: too few arguments to function 'cs->read'
> kernel/time/clocksource.c:173: error: too few arguments to function 'watchdog->read'
> kernel/time/clocksource.c:194: error: too few arguments to function 'watchdog->read'
> make[3]: *** [kernel/time/clocksource.o] Error
>
This seems to be from clocksource-pass-clocksource-to-read-callback.patch
CCed to Magnus.
This is my temporal patch.
==
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
kernel/time/clocksource.c: In function ‘clocksource_watchdog’:kernel/time/clocksource.c:108: error: too few arguments to function ‘watchdog->read’
kernel/time/clocksource.c:113: error: too few arguments to function ‘cs->read’
kernel/time/clocksource.c: In function ‘clocksource_check_watchdog’:
kernel/time/clocksource.c:173: error: too few arguments to function ‘watchdog->read’
kernel/time/clocksource.c:194: error: too few arguments to function ‘watchdog->read’
make[2]: *** [kernel/time/clocksource.o] Error 1
make[1]: *** [kernel/time] Error 2
make: *** [kernel] Error 2
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
kernel/time/clocksource.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mmotm-2.6.28-Dec12/kernel/time/clocksource.c
===================================================================
--- mmotm-2.6.28-Dec12.orig/kernel/time/clocksource.c
+++ mmotm-2.6.28-Dec12/kernel/time/clocksource.c
@@ -105,12 +105,12 @@ static void clocksource_watchdog(unsigne
resumed = test_and_clear_bit(0, &watchdog_resumed);
- wdnow = watchdog->read();
+ wdnow = clocksource_read(watchdog);
wd_nsec = cyc2ns(watchdog, (wdnow - watchdog_last) & watchdog->mask);
watchdog_last = wdnow;
list_for_each_entry_safe(cs, tmp, &watchdog_list, wd_list) {
- csnow = cs->read();
+ csnow = clocksource_read(cs);
if (unlikely(resumed)) {
cs->wd_last = csnow;
@@ -170,7 +170,7 @@ static void clocksource_check_watchdog(s
list_add(&cs->wd_list, &watchdog_list);
if (!started && watchdog) {
- watchdog_last = watchdog->read();
+ watchdog_last = clocksource_read(watchdog);
watchdog_timer.expires = jiffies + WATCHDOG_INTERVAL;
add_timer_on(&watchdog_timer,
first_cpu(cpu_online_map));
@@ -191,7 +191,7 @@ static void clocksource_check_watchdog(s
cse->flags &= ~CLOCK_SOURCE_WATCHDOG;
/* Start if list is not empty */
if (!list_empty(&watchdog_list)) {
- watchdog_last = watchdog->read();
+ watchdog_last = clocksource_read(watchdog);
watchdog_timer.expires =
jiffies + WATCHDOG_INTERVAL;
add_timer_on(&watchdog_timer,
^ permalink raw reply [flat|nested] 2+ messages in thread