diff options
| author | john stultz <johnstul@us.ibm.com> | 2007-02-16 04:28:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:14:00 -0500 |
| commit | 1489939f0ab64b96998e04068c516c39afe29654 (patch) | |
| tree | 6bb3ca772edf1dd8877482dc3b6bcc6f0d699e72 /arch/x86_64/kernel/smpboot.c | |
| parent | c37e7bb5d2ce36ef377caabfced0b132bb1bf6a7 (diff) | |
[PATCH] time: x86_64: convert x86_64 to use GENERIC_TIME
This patch converts x86_64 to use the GENERIC_TIME infrastructure and adds
clocksource structures for both TSC and HPET (ACPI PM is shared w/ i386).
[akpm@osdl.org: fix printk timestamps]
[akpm@osdl.org: fix printk ckeanups]
[akpm@osdl.org: hpet build fix]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
| -rw-r--r-- | arch/x86_64/kernel/smpboot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 62d828433c30..35443729aad8 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
| @@ -982,7 +982,6 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
| 982 | smp_cleanup_boot(); | 982 | smp_cleanup_boot(); |
| 983 | setup_ioapic_dest(); | 983 | setup_ioapic_dest(); |
| 984 | check_nmi_watchdog(); | 984 | check_nmi_watchdog(); |
| 985 | time_init_gtod(); | ||
| 986 | } | 985 | } |
| 987 | 986 | ||
| 988 | #ifdef CONFIG_HOTPLUG_CPU | 987 | #ifdef CONFIG_HOTPLUG_CPU |