diff options
author | H. Peter Anvin | 2010-10-20 23:22:45 +0200 |
---|---|---|
committer | H. Peter Anvin | 2010-10-20 23:22:45 +0200 |
commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
tree | 3c914b877adf9615c7158b58705478e56c9b4247 /arch/x86/kernel/apb_timer.c | |
parent | Merge branch 'x86/vmware' into x86/trampoline (diff) | |
parent | x86: Remove stale pmtimer_64.c (diff) | |
download | kernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.gz kernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.xz kernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.zip |
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'arch/x86/kernel/apb_timer.c')
-rw-r--r-- | arch/x86/kernel/apb_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index 8dd77800ff5d..08f75fb4f509 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c @@ -343,7 +343,7 @@ void apbt_setup_secondary_clock(void) /* Don't register boot CPU clockevent */ cpu = smp_processor_id(); - if (cpu == boot_cpu_id) + if (!cpu) return; /* * We need to calculate the scaled math multiplication factor for |