diff options
author | Chris Wright <chrisw@sous-sol.org> | 2007-07-21 11:11:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:14 -0400 |
commit | 43d6ca01844789b4c695175f8c205861a06a84cb (patch) | |
tree | 2d5e1bc3d9ec1e0f8c2ffd339d4e774160ee4911 /arch/i386 | |
parent | f5352fd0ce41b079a01e23c01ea3578c29f097e7 (diff) |
i386: hpet assumes boot cpu is 0
I fixed this in x86_64. Looks like the kind of thing that will break voyager
on i386.
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index b93310d11950..533d4932bc79 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c | |||
@@ -326,7 +326,7 @@ int __init hpet_enable(void) | |||
326 | * Start hpet with the boot cpu mask and make it | 326 | * Start hpet with the boot cpu mask and make it |
327 | * global after the IO_APIC has been initialized. | 327 | * global after the IO_APIC has been initialized. |
328 | */ | 328 | */ |
329 | hpet_clockevent.cpumask =cpumask_of_cpu(0); | 329 | hpet_clockevent.cpumask = cpumask_of_cpu(smp_processor_id()); |
330 | clockevents_register_device(&hpet_clockevent); | 330 | clockevents_register_device(&hpet_clockevent); |
331 | global_clock_event = &hpet_clockevent; | 331 | global_clock_event = &hpet_clockevent; |
332 | return 1; | 332 | return 1; |