diff options
| author |  Thomas Gleixner <tglx@linutronix.de>
| 2016-11-29 20:28:31 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de>
| 2016-11-30 09:44:52 +0100 |
| commit | b836554386cc77f31ab43a8492a2587e0c51d51e (patch) | |
| tree | f0b48454f0758cf45c943ec74054566a35e0f08b /arch/x86/kernel/tsc_sync.c | |
| parent | x86/tsc: Try to adjust TSC if sync test fails (diff) | |
| download | linux-b836554386cc77f31ab43a8492a2587e0c51d51e.tar.gz linux-b836554386cc77f31ab43a8492a2587e0c51d51e.tar.bz2 linux-b836554386cc77f31ab43a8492a2587e0c51d51e.zip | |
x86/tsc: Fix broken CONFIG_X86_TSC=n build
Add the missing return statement to the inline stub
tsc_store_and_check_tsc_adjust() and add the other stubs to make a
SMP=y,TSC=n build happy.
While at it, remove the unused variable from the UP variant of
tsc_store_and_check_tsc_adjust().
Fixes: commit ba75fb646931 ("x86/tsc: Sync test only for the first cpu in a package")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/tsc_sync.c')
| -rw-r--r-- | arch/x86/kernel/tsc_sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index d7f48a640ff5..8fde44f8cfec 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -61,7 +61,7 @@ void tsc_verify_tsc_adjust(void) #ifndef CONFIG_SMP bool __init tsc_store_and_check_tsc_adjust(void) { - struct tsc_adjust *ref, *cur = this_cpu_ptr(&tsc_adjust); + struct tsc_adjust *cur = this_cpu_ptr(&tsc_adjust); s64 bootval; if (!boot_cpu_has(X86_FEATURE_TSC_ADJUST)) |