aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--arch/x86/kernel/cpu/intel_cacheinfo.c17
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index c9786480f0fe..e75daac64962 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -172,6 +172,8 @@ extern void print_cpu_info(struct cpuinfo_x86 *);
172extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c); 172extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
173extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c); 173extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
174extern unsigned short num_cache_leaves; 174extern unsigned short num_cache_leaves;
175extern int get_shared_cpu_map(cpumask_var_t mask,
176 unsigned int cpu, int index);
175 177
176extern void detect_extended_topology(struct cpuinfo_x86 *c); 178extern void detect_extended_topology(struct cpuinfo_x86 *c);
177extern void detect_ht(struct cpuinfo_x86 *c); 179extern void detect_ht(struct cpuinfo_x86 *c);
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 804c40e2bc3e..3167c3d72596 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -515,6 +515,23 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
515static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info); 515static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
516#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y])) 516#define CPUID4_INFO_IDX(x, y) (&((per_cpu(cpuid4_info, x))[y]))
517 517
518/* returns CPUs that share the index cache with cpu */
519int get_shared_cpu_map(cpumask_var_t mask, unsigned int cpu, int index)
520{
521 int ret = 0;
522 struct _cpuid4_info *this_leaf;
523
524 if (index >= num_cache_leaves) {
525 index = num_cache_leaves - 1;
526 ret = index;
527 }
528
529 this_leaf = CPUID4_INFO_IDX(cpu,index);
530 cpumask_copy(mask, to_cpumask(this_leaf->shared_cpu_map));
531
532 return ret;
533}
534
518#ifdef CONFIG_SMP 535#ifdef CONFIG_SMP
519static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) 536static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
520{ 537{