diff options
author | Andi Kleen <ak@suse.de> | 2005-04-16 18:25:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:19 -0400 |
commit | a8ab26fe5bfeef43bdcde5182ca051ae0647607e (patch) | |
tree | 456f92b42111f83a4568b27efd863f20ffabbe3c /arch/x86_64/kernel/time.c | |
parent | ebfcaa96fccc01301a577c5c56a5f00543cf167e (diff) |
[PATCH] x86_64: Switch SMP bootup over to new CPU hotplug state machine
This will allow hotplug CPU in the future and in general cleans up a lot of
crufty code. It also should plug some races that the old hackish way
introduces. Remove one old race workaround in NMI watchdog setup that is not
needed anymore.
I removed the old total sum of bogomips reporting code. The brag value of
BogoMips has been greatly devalued in the last years on the open market.
Real CPU hotplug will need some more work, but the infrastructure for it is
there now.
One drawback: the new TSC sync algorithm is less accurate than before. The
old way of zeroing TSCs is too intrusive to do later. Instead the TSC of the
BP is duplicated now, which is less accurate.
akpm:
- sync_tsc_bp_init seems to have the sense of `init' inverted.
- SPIN_LOCK_UNLOCKED is deprecated - use DEFINE_SPINLOCK.
Cc: <rusty@rustcorp.com.au>
Cc: <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r-- | arch/x86_64/kernel/time.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index c7a1b50b4af3..943a9bfba209 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -916,9 +916,16 @@ void __init time_init(void) | |||
916 | setup_irq(0, &irq0); | 916 | setup_irq(0, &irq0); |
917 | 917 | ||
918 | set_cyc2ns_scale(cpu_khz / 1000); | 918 | set_cyc2ns_scale(cpu_khz / 1000); |
919 | |||
920 | #ifndef CONFIG_SMP | ||
921 | time_init_gtod(); | ||
922 | #endif | ||
919 | } | 923 | } |
920 | 924 | ||
921 | void __init time_init_smp(void) | 925 | /* |
926 | * Decide after all CPUs are booted what mode gettimeofday should use. | ||
927 | */ | ||
928 | void __init time_init_gtod(void) | ||
922 | { | 929 | { |
923 | char *timetype; | 930 | char *timetype; |
924 | 931 | ||