From 239412ea79ba2b9bc1c8f25aabf123ac77e30401 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 8 Nov 2011 11:19:55 +1100 Subject: [PATCH] x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix fix CONFIG_SMP=n build arch/x86/kernel/tsc.c: In function 'calibrate_delay_is_known': arch/x86/kernel/tsc.c:1012: error: 'struct cpuinfo_x86' has no member named 'phys_proc_id' arch/x86/kernel/tsc.c:1012: error: 'struct cpuinfo_x86' has no member named 'phys_proc_id' arch/x86/kernel/tsc.c:1006: warning: unused variable 'cpu' Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jack Steiner Cc: John Stultz Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/x86/kernel/tsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index ade03e38d237..490fb330be87 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -995,6 +995,7 @@ void __init tsc_init(void) check_system_tsc_reliable(); } +#ifdef CONFIG_SMP /* * If we have a constant TSC and are using the TSC for the delay loop, * we can skip clock calibration if another cpu in the same socket has already @@ -1013,4 +1014,4 @@ unsigned long __cpuinit calibrate_delay_is_known(void) return cpu_data(i).loops_per_jiffy; return 0; } - +#endif -- 2.39.5