From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Borislav Petkov <borislav.petkov@amd.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Li Zefan <lizf@cn.fujitsu.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Andreas Herrmann <andreas.herrmann3@amd.com>
Subject: linux-next: manual merge of the edac-amd tree with the rr tree
Date: Thu, 6 Aug 2009 17:51:52 +1000 [thread overview]
Message-ID: <20090806175152.1e0b96cf.sfr@canb.auug.org.au> (raw)
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@canb.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);
next reply other threads:[~2009-08-06 7:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-06 7:51 Stephen Rothwell [this message]
2009-08-06 8:07 ` Borislav Petkov
-- strict thread matches above, loose matches on Subject: below --
2009-11-19 5:23 Stephen Rothwell
2009-11-19 6:06 ` Borislav Petkov
2009-11-19 6:56 ` Rusty Russell
2009-07-30 5:41 Stephen Rothwell
2009-07-30 6:23 ` Borislav Petkov
2009-07-30 7:08 ` Stephen Rothwell
2009-07-30 11:09 ` Borislav Petkov
2009-07-31 2:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090806175152.1e0b96cf.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andreas.herrmann3@amd.com \
--cc=borislav.petkov@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®