linux-next: manual merge of the percpu tree with the tip tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kernel/cpu/intel_cacheinfo.c between commit
ebb682f522411abbe358059a256a8672ec0bd55b ("x86, AMD: Fix stale
cpuid4_info shared_map data in shared_cpu_map cpumasks") from the tip
tree and commit 0fe1e009541e925adc1748a605d8b66188e4b2ab ("percpu: make
percpu symbols in x86 unique") from the percpu tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
index 63ada17,55d2ef3..0000000
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@@ -511,15 -508,14 +511,15 @@@ static void __cpuinit cache_shared_cpu_
  	struct cpuinfo_x86 *c = &cpu_data(cpu);
  
  	if ((index == 3) && (c->x86_vendor == X86_VENDOR_AMD)) {
 -		struct cpuinfo_x86 *d;
 -		for_each_online_cpu(i) {
 +		for_each_cpu(i, c->llc_shared_map) {
- 			if (!per_cpu(cpuid4_info, i))
+ 			if (!per_cpu(ici_cpuid4_info, i))
  				continue;
 -			d = &cpu_data(i);
  			this_leaf = CPUID4_INFO_IDX(i, index);
 -			cpumask_copy(to_cpumask(this_leaf->shared_cpu_map),
 -				     d->llc_shared_map);
 +			for_each_cpu(sibling, c->llc_shared_map) {
 +				if (!cpu_online(sibling))
 +					continue;
 +				set_bit(sibling, this_leaf->shared_cpu_map);
 +			}
  		}
  		return;
  	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/