diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-16 21:15:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-16 21:15:36 -0700 |
| commit | 6553daeafb4fa15cd07088f543352fa3779e86e1 (patch) | |
| tree | 1e1952e7ce3227160a9bec60b24dc816f495b6b8 /arch/sparc64/kernel/mdesc.c | |
| parent | edb1e9671a990e6eb9f593636deed7ac43ba9084 (diff) | |
| parent | 8a177c4f17c691c2c9a08a54709d37c6db481a0b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Warn user if cpu is ignored.
[SPARC64]: Fix lockdep, particularly on SMP.
[SPARC64]: Update defconfig.
Diffstat (limited to 'arch/sparc64/kernel/mdesc.c')
| -rw-r--r-- | arch/sparc64/kernel/mdesc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c index 9f22e4ff601..856659bb131 100644 --- a/arch/sparc64/kernel/mdesc.c +++ b/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 |