The patch titled
GTOD: persistent clock support, i386 (update)
has been added to the -mm tree. Its filename is
gtod-persistent-clock-support-i386-update.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: GTOD: persistent clock support, i386 (update)
From: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/apm.c | 1 +
arch/i386/kernel/time.c | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/apm.c~gtod-persistent-clock-support-i386-update arch/i386/kernel/apm.c
--- a/arch/i386/kernel/apm.c~gtod-persistent-clock-support-i386-update
+++ a/arch/i386/kernel/apm.c
@@ -234,6 +234,7 @@
#include "io_ports.h"
+extern unsigned long get_cmos_time(void);
extern void machine_real_restart(unsigned char *, int);
#if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
diff -puN arch/i386/kernel/time.c~gtod-persistent-clock-support-i386-update arch/i386/kernel/time.c
--- a/arch/i386/kernel/time.c~gtod-persistent-clock-support-i386-update
+++ a/arch/i386/kernel/time.c
@@ -290,7 +290,7 @@ static int timer_resume(struct sys_devic
hpet_reenable();
#endif
setup_pit_timer();
-
+ touch_softlockup_watchdog();
return 0;
}
@@ -341,6 +341,5 @@ void __init time_init(void)
return;
}
#endif
-
time_init_hook();
}
_
Patches currently in -mm which might be from johnstul@xxxxxxxxxx are
origin.patch
gtod-exponential-update_wall_time.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-core-update.patch
gtod-persistent-clock-support-i386.patch
gtod-persistent-clock-support-i386-update.patch
time-uninline-jiffiesh.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a.patch
dynticks-extend-next_timer_interrupt-to-use-a.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-state-tracking-fix.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
clockevents-drivers-for-i386-fix.patch
high-res-timers-core.patch
high-res-timers-core-fix.patch
dynticks-core.patch
dynticks-core-nmi-watchdog-fix.patch
dyntick-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
debugging-feature-timer-stats-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
