linux-kernel - linux-next: manual merge of the edac-amd tree with the rr 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20090806175152.1e0b96cf.sfr@canb.auug.org.au>
Date:	Thu, 6 Aug 2009 17:51:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Borislav Petkov <borislav.petkov@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Li Zefan <lizf@...fujitsu.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Andreas Herrmann <andreas.herrmann3@....com>
Subject: linux-next: manual merge of the edac-amd tree with the rr tree

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in
arch/x86/kernel/smpboot.c between commit
d39044d21e1a2d3713f1329ad22d23df5d20140b ("cpumask: use zalloc_cpumask_var
() where possible") from the rr tree and commit
a763af6587fbead6cee75ad3ae14709fa67e7dbb ("x86: provide CPU topology
information for multi-node processors") from the edac-amd tree.

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/smpboot.c
index 70bd79b,5428337..0000000
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -1057,9 -1068,14 +1068,10 @@@ void __init native_smp_prepare_cpus(uns
  #endif
  	current_thread_info()->cpu = 0;  /* needed? */
  	for_each_possible_cpu(i) {
 -		alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
 -		alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
 -		alloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
 -		alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
 -		cpumask_clear(per_cpu(cpu_core_map, i));
 -		cpumask_clear(per_cpu(cpu_node_map, i));
 -		cpumask_clear(per_cpu(cpu_sibling_map, i));
 -		cpumask_clear(cpu_data(i).llc_shared_map);
 +		zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
 +		zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
++		zalloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
 +		zalloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
  	}
  	set_cpu_sibling_map(0);
  
--
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/