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>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jack Steiner <steiner@sgi•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"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: Fri, 31 Dec 2010 13:55:46 +1100 [thread overview]
Message-ID: <20101231135546.73f318bc.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kernel/apic/x2apic_uv_x.c between commit
d8850ba425d9823d3184bd52f065899dac4689f9 ("x86, UV: Fix the effect of
extra bits in the hub nodeid register") from the tip tree and commit
0a3aee0da4402aa19b66e458038533c896fb80c6 ("x86: Use this_cpu_ops to
optimize code") from the percpu 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/apic/x2apic_uv_x.c
index 2a3f2a7,26ec9a7..0000000
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@@ -120,8 -118,8 +120,8 @@@ static int __init uv_acpi_madt_oem_chec
else if (!strcmp(oem_table_id, "UVX"))
uv_system_type = UV_X2APIC;
else if (!strcmp(oem_table_id, "UVH")) {
- __get_cpu_var(x2apic_extra_bits) =
- pnodeid << uvh_apicid.s.pnode_shift;
+ __this_cpu_write(x2apic_extra_bits,
- nodeid << (uvh_apicid.s.pnode_shift - 1));
++ pnodeid << uvh_apicid.s.pnode_shift);
uv_system_type = UV_NON_UNIQUE_APIC;
uv_set_apicid_hibit();
return 1;
next reply other threads:[~2010-12-31 2:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-31 2:55 Stephen Rothwell [this message]
2010-12-31 11:17 ` linux-next: manual merge of the percpu tree with the tip tree Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2014-10-09 4:50 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-10 2:32 Stephen Rothwell
2010-02-03 5:38 Stephen Rothwell
2010-02-03 22:26 ` Frederic Weisbecker
2009-12-14 4:30 Stephen Rothwell
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=20101231135546.73f318bc.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=rusty@rustcorp$(echo .)com.au \
--cc=steiner@sgi$(echo .)com \
--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