diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:40:34 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:40:42 -0400 |
| commit | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (patch) | |
| tree | 9246462da99ef4eb53c9c89a137d0a88c897f3d6 /arch/x86/kernel/apb_timer.c | |
| parent | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (diff) | |
| parent | 234bb549eea16ec7d5207ba747fb8dbf489e64c1 (diff) | |
Merge branch 'x86/cleanups' into irq/sparseirq
Reason: Avoid conflicts with removal of boot_cpu_id
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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) | |||
| 343 | 343 | ||
| 344 | /* Don't register boot CPU clockevent */ | 344 | /* Don't register boot CPU clockevent */ |
| 345 | cpu = smp_processor_id(); | 345 | cpu = smp_processor_id(); |
| 346 | if (cpu == boot_cpu_id) | 346 | if (!cpu) |
| 347 | return; | 347 | return; |
| 348 | /* | 348 | /* |
| 349 | * We need to calculate the scaled math multiplication factor for | 349 | * We need to calculate the scaled math multiplication factor for |