The patch titled
i383 numa: fix numaq/summit apicid conflict
has been added to the -mm tree. Its filename is
i383-numa-fix-numaq-summit-apicid-conflict.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i383 numa: fix numaq/summit apicid conflict
From: Keith Mannthey <kmannth@xxxxxxxxxx>
Allow numaq to properly align cpus to their given node during boot. Pass
logical apicid to apicid_to_node and allow the summit sub-arch to use
physical apicid (hard_smp_processor_id()).
Tested against numaq and summit based systems with no issues.
Signed-off-by: Keith Mannthey <kmannth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/smpboot.c | 2 +-
include/asm-i386/mach-summit/mach_apic.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/smpboot.c~i383-numa-fix-numaq-summit-apicid-conflict arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/smpboot.c~i383-numa-fix-numaq-summit-apicid-conflict
+++ a/arch/i386/kernel/smpboot.c
@@ -648,7 +648,7 @@ static void map_cpu_to_logical_apicid(vo
{
int cpu = smp_processor_id();
int apicid = logical_smp_processor_id();
- int node = apicid_to_node(hard_smp_processor_id());
+ int node = apicid_to_node(apicid);
if (!node_online(node))
node = first_online_node;
diff -puN include/asm-i386/mach-summit/mach_apic.h~i383-numa-fix-numaq-summit-apicid-conflict include/asm-i386/mach-summit/mach_apic.h
--- a/include/asm-i386/mach-summit/mach_apic.h~i383-numa-fix-numaq-summit-apicid-conflict
+++ a/include/asm-i386/mach-summit/mach_apic.h
@@ -88,7 +88,7 @@ static inline void clustered_apic_check(
static inline int apicid_to_node(int logical_apicid)
{
- return apicid_2_node[logical_apicid];
+ return apicid_2_node[hard_smp_processor_id()];
}
/* Mapping from cpu number to logical apicid */
_
Patches currently in -mm which might be from kmannth@xxxxxxxxxx are
origin.patch
i383-numa-fix-numaq-summit-apicid-conflict.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
