lkml.org 
[lkml]   [2010]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@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;


\
 
 \ /
  Last update: 2010-12-31 03:59    [W:4.475 / U:1.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site