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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 14 Dec 2009 15:30:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Prarit Bhargava <prarit@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the percpu tree with the tip tree

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@...b.auug.org.au

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/