From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Rusty Russell <rusty@rustcorp•com.au>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Prarit Bhargava <prarit@redhat•com>,
Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the percpu tree with the tip tree
Date: Mon, 14 Dec 2009 15:30:33 +1100 [thread overview]
Message-ID: <20091214153033.6224eefa.sfr@canb.auug.org.au> (raw)
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@canb•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;
}
next reply other threads:[~2009-12-14 4:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-14 4:30 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-09 4:50 linux-next: manual merge of the percpu tree with the tip tree Stephen Rothwell
2014-10-09 13:13 ` Frederic Weisbecker
2014-10-09 13:15 ` Tejun Heo
2014-10-09 13:18 ` Frederic Weisbecker
2012-05-16 7:36 Stephen Rothwell
2012-05-16 13:40 ` Alex Shi
2011-04-20 3:50 Stephen Rothwell
2011-02-11 3:58 Stephen Rothwell
2011-02-11 9:52 ` Tejun Heo
2011-01-05 2:54 Stephen Rothwell
2010-12-31 2:55 Stephen Rothwell
2010-12-31 11:17 ` Tejun Heo
2010-12-31 2:55 Stephen Rothwell
2010-12-10 2:32 Stephen Rothwell
2010-02-03 5:38 Stephen Rothwell
2010-02-03 22:26 ` Frederic Weisbecker
2009-11-11 7:59 Stephen Rothwell
2009-09-03 9:11 Stephen Rothwell
2009-07-06 5:06 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=20091214153033.6224eefa.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=prarit@redhat$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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