From 98ca4dca6c7f95ceea11b6197d338c625631e068 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 16 Sep 2007 14:45:06 -0700 Subject: [PATCH] --- yaml --- r: 65007 b: refs/heads/master c: 8a177c4f17c691c2c9a08a54709d37c6db481a0b h: refs/heads/master i: 65005: 0bfb89dcb7428480dbf320f91742f8ccc2906bfe 65003: 8b1551d24e029021984f514a54493368e54594f9 64999: b61d4bf66fa8a9697f3b51339af6d1702236c029 64991: 996eb0901d52bacc12b3e0dd9cbba7ee4edcc616 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/mdesc.c | 6 +++++- trunk/arch/sparc64/kernel/prom.c | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 854cc240ab2f..d8b6b6ff0b66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 301feb652441a7168b59256fc44918075dcab0d5 +refs/heads/master: 8a177c4f17c691c2c9a08a54709d37c6db481a0b diff --git a/trunk/arch/sparc64/kernel/mdesc.c b/trunk/arch/sparc64/kernel/mdesc.c index 9f22e4ff6015..856659bb1311 100644 --- a/trunk/arch/sparc64/kernel/mdesc.c +++ b/trunk/arch/sparc64/kernel/mdesc.c @@ -777,8 +777,12 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask) cpuid = *id; #ifdef CONFIG_SMP - if (cpuid >= NR_CPUS) + if (cpuid >= NR_CPUS) { + printk(KERN_WARNING "Ignoring CPU %d which is " + ">= NR_CPUS (%d)\n", + cpuid, NR_CPUS); continue; + } if (!cpu_isset(cpuid, mask)) continue; #else diff --git a/trunk/arch/sparc64/kernel/prom.c b/trunk/arch/sparc64/kernel/prom.c index d1a78c976cef..0614dff63d7c 100644 --- a/trunk/arch/sparc64/kernel/prom.c +++ b/trunk/arch/sparc64/kernel/prom.c @@ -1583,8 +1583,12 @@ static void __init of_fill_in_cpu_data(void) ncpus_probed++; #ifdef CONFIG_SMP - if (cpuid >= NR_CPUS) + if (cpuid >= NR_CPUS) { + printk(KERN_WARNING "Ignoring CPU %d which is " + ">= NR_CPUS (%d)\n", + cpuid, NR_CPUS); continue; + } #else /* On uniprocessor we only want the values for the * real physical cpu the kernel booted onto, however