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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20101231135546.73f318bc.sfr@canb.auug.org.au>
Date:	Fri, 31 Dec 2010 13:55:46 +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,
	Jack Steiner <steiner@....com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "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/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@...b.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;
--
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/