diff options
author | David Woodhouse <dwmw2@infradead.org> | 2015-09-16 14:10:03 +0100 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:10 +0100 |
commit | d8e332d409c06a68412c7d9a6f4c582249f2e9ff (patch) | |
tree | 1eb23802c15e95a3d6d39db5ad78d2177fc85a39 /arch/avr32/mach-at32ap | |
parent | 7aa36cdf3d1e0bf7fd00009049be139618737eb7 (diff) | |
download | linux-stable-d8e332d409c06a68412c7d9a6f4c582249f2e9ff.tar.gz linux-stable-d8e332d409c06a68412c7d9a6f4c582249f2e9ff.tar.bz2 linux-stable-d8e332d409c06a68412c7d9a6f4c582249f2e9ff.zip |
x86/platform: Fix Geode LX timekeeping in the generic x86 build
commit 03da3ff1cfcd7774c8780d2547ba0d995f7dc03d upstream.
In 2007, commit 07190a08eef36 ("Mark TSC on GeodeLX reliable")
bypassed verification of the TSC on Geode LX. However, this code
(now in the check_system_tsc_reliable() function in
arch/x86/kernel/tsc.c) was only present if CONFIG_MGEODE_LX was
set.
OpenWRT has recently started building its generic Geode target
for Geode GX, not LX, to include support for additional
platforms. This broke the timekeeping on LX-based devices,
because the TSC wasn't marked as reliable:
https://dev.openwrt.org/ticket/20531
By adding a runtime check on is_geode_lx(), we can also include
the fix if CONFIG_MGEODEGX1 or CONFIG_X86_GENERIC are set, thus
fixing the problem.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marcelo Tosatti <marcelo@kvack.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1442409003.131189.87.camel@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/avr32/mach-at32ap')
0 files changed, 0 insertions, 0 deletions