diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-14 23:03:09 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-14 23:03:09 +0200 |
| commit | 2886a734081ed31f3279550ea9d50ef1d84a84e6 (patch) | |
| tree | 784ced963e0db15f631b1ecb94da6c5e031ca5af /arch/x86/kernel/apic/apic.c | |
| parent | ad19638463a4b5c909fcebf0f19358c4bf4fed48 (diff) | |
| parent | 6fc46497a9fb283c4f8e8d04ae4f0bf3c0041f7e (diff) | |
| download | linux-2886a734081ed31f3279550ea9d50ef1d84a84e6.tar.bz2 | |
Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Merge timer updates from John Stultz:
A preparatory patch series for correcting the clock event devices via NTP
to avoid early timer expiry and reprogramming.
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8ccb7ef512e0..875091d4609d 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -731,8 +731,10 @@ static int __init calibrate_APIC_clock(void) TICK_NSEC, lapic_clockevent.shift); lapic_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFF, &lapic_clockevent); + lapic_clockevent.max_delta_ticks = 0x7FFFFF; lapic_clockevent.min_delta_ns = clockevent_delta2ns(0xF, &lapic_clockevent); + lapic_clockevent.min_delta_ticks = 0xF; lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; return 0; } @@ -778,8 +780,10 @@ static int __init calibrate_APIC_clock(void) lapic_clockevent.shift); lapic_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, &lapic_clockevent); + lapic_clockevent.max_delta_ticks = 0x7FFFFFFF; lapic_clockevent.min_delta_ns = clockevent_delta2ns(0xF, &lapic_clockevent); + lapic_clockevent.min_delta_ticks = 0xF; lapic_timer_frequency = (delta * APIC_DIVISOR) / LAPIC_CAL_LOOPS; |