diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 11:20:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-15 11:20:44 -0700 |
| commit | 8ab84ef699e5495d37ace5801c5cb788cafcf9da (patch) | |
| tree | 4a906353c5fff8c26e66fa6f9991c3b73fe70a93 /arch/x86/platform/intel-mid/mfld.c | |
| parent | Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/platform/intel/quark: Drop IMR lock bit support (diff) | |
| download | linux-dev-8ab84ef699e5495d37ace5801c5cb788cafcf9da.tar.xz linux-dev-8ab84ef699e5495d37ace5801c5cb788cafcf9da.zip | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 core platform updates from Ingo Molnar:
"Intel Quark and Geode SoC platform updates"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/intel/quark: Drop IMR lock bit support
x86/platform/intel/mid: Remove dead code
x86/platform: Make platform/geode/net5501.c explicitly non-modular
x86/platform: Make platform/geode/alix.c explicitly non-modular
x86/platform: Make platform/geode/geos.c explicitly non-modular
x86/platform: Make platform/intel-quark/imr_selftest.c explicitly non-modular
x86/platform: Make platform/intel-quark/imr.c explicitly non-modular
Diffstat (limited to 'arch/x86/platform/intel-mid/mfld.c')
| -rw-r--r-- | arch/x86/platform/intel-mid/mfld.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c index 23381d2174ae..1eb47b6298c2 100644 --- a/arch/x86/platform/intel-mid/mfld.c +++ b/arch/x86/platform/intel-mid/mfld.c @@ -52,10 +52,7 @@ static unsigned long __init mfld_calibrate_tsc(void) /* mark tsc clocksource as reliable */ set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE); - if (fast_calibrate) - return fast_calibrate; - - return 0; + return fast_calibrate; } static void __init penwell_arch_setup(void) |