From 6781e85dad2b5498c7daffface524f92c71485f7 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 7 Feb 2011 14:08:53 -0800 Subject: [PATCH] --- yaml --- r: 234838 b: refs/heads/master c: 14392fd329eca9b59d51c0aa5d0acfb4965424d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa.c | 4 ++++ trunk/arch/x86/mm/numa_64.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9da35b3e8524..4b52f6f72310 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b366801c95bdbeda811ac9668a3943051a18c188 +refs/heads/master: 14392fd329eca9b59d51c0aa5d0acfb4965424d1 diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c index bf60715bd1b7..9559d360fde7 100644 --- a/trunk/arch/x86/mm/numa.c +++ b/trunk/arch/x86/mm/numa.c @@ -219,6 +219,10 @@ struct cpumask __cpuinit *debug_cpumask_set_cpu(int cpu, int enable) struct cpumask *mask; char buf[64]; + if (node == NUMA_NO_NODE) { + /* early_cpu_to_node() already emits a warning and trace */ + return NULL; + } mask = node_to_cpumask_map[node]; if (!mask) { pr_err("node_to_cpumask_map[%i] NULL\n", node); diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c index f548fbf75f44..3f9411ed3cdc 100644 --- a/trunk/arch/x86/mm/numa_64.c +++ b/trunk/arch/x86/mm/numa_64.c @@ -709,6 +709,10 @@ static void __cpuinit numa_set_cpumask(int cpu, int enable) struct cpumask *mask; int i; + if (node == NUMA_NO_NODE) { + /* early_cpu_to_node() already emits a warning and trace */ + return; + } for_each_online_node(i) { unsigned long addr;