diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 06:24:38 -0500 |
| commit | c3895b01e80d120e8d19435f7cb1fa4c60c4e269 (patch) | |
| tree | 426f36e999289eeb7a41f6f4ca8ff45bfc2372aa /arch/x86/kernel/i8253.c | |
| parent | 3c68b4a8071fb11d905570d9b0e23034adc6c2bb (diff) | |
| parent | 968ea6d80e395cf11a51143cfa1b9a14ada676df (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
Diffstat (limited to 'arch/x86/kernel/i8253.c')
| -rw-r--r-- | arch/x86/kernel/i8253.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index c1b5e3ece1f2..10f92fb532f3 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
| @@ -114,7 +114,7 @@ void __init setup_pit_timer(void) | |||
| 114 | * Start pit with the boot cpu mask and make it global after the | 114 | * Start pit with the boot cpu mask and make it global after the |
| 115 | * IO_APIC has been initialized. | 115 | * IO_APIC has been initialized. |
| 116 | */ | 116 | */ |
| 117 | pit_clockevent.cpumask = cpumask_of_cpu(smp_processor_id()); | 117 | pit_clockevent.cpumask = cpumask_of(smp_processor_id()); |
| 118 | pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, | 118 | pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, |
| 119 | pit_clockevent.shift); | 119 | pit_clockevent.shift); |
| 120 | pit_clockevent.max_delta_ns = | 120 | pit_clockevent.max_delta_ns = |