diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 06:47:21 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 06:47:21 +0100 |
| commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
| tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /arch/x86/kernel/apic/apic.c | |
| parent | ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support (diff) | |
| parent | ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel (diff) | |
| download | linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.tar.xz linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.zip | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a51345ba449e..06c196d7e59c 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -684,7 +684,7 @@ static int __init calibrate_APIC_clock(void) lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS, lapic_clockevent.shift); lapic_clockevent.max_delta_ns = - clockevent_delta2ns(0x7FFFFF, &lapic_clockevent); + clockevent_delta2ns(0x7FFFFFFF, &lapic_clockevent); lapic_clockevent.min_delta_ns = clockevent_delta2ns(0xF, &lapic_clockevent); |