x86/timers update for v4.6

GIT PULL Ingo Molnar 1 participant 1 message Mar 14, 2016 x86

lore

Share & tools

lore

Ingo Molnar

author

2016-03-14 13:34 UTC #0 lore raw

Linus,

Please pull the latest x86-timers-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-timers-for-linus

# HEAD: c25323c07345a843a56a294047b130dfd9250fad x86/tsc: Use topology functions

A single simplification of the x86 TSC code.

Thanks,

Ingo

------------------>
Thomas Gleixner (1):
x86/tsc: Use topology functions

 arch/x86/kernel/tsc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/x86/kernel/tsc.c +4 -4

index 3d743da828d3..5a6cb4684e0f 100644
@@ -1246,14 +1246,14 @@ void __init tsc_init(void)
  */
 unsigned long calibrate_delay_is_known(void)
 {
-	int i, cpu = smp_processor_id();
+	int sibling, cpu = smp_processor_id();
 
 	if (!tsc_disabled && !cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))
 		return 0;
 
-	for_each_online_cpu(i)
-		if (cpu_data(i).phys_proc_id == cpu_data(cpu).phys_proc_id)
-			return cpu_data(i).loops_per_jiffy;
+	sibling = cpumask_any_but(topology_core_cpumask(cpu), cpu);
+	if (sibling < nr_cpu_ids)
+		return cpu_data(sibling).loops_per_jiffy;
 	return 0;
 }
 #endif