diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-09-16 17:45:06 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-09-16 17:45:06 -0400 |
commit | 8a177c4f17c691c2c9a08a54709d37c6db481a0b (patch) | |
tree | 3cee80b12a57e7b83d501e5a73c2d856ce89615b | |
parent | 301feb652441a7168b59256fc44918075dcab0d5 (diff) |
[SPARC64]: Warn user if cpu is ignored.
When NR_CPUS is smaller than the cpu probed, let the user
know that the cpu won't be used.
Suggested by Al Viro.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/mdesc.c | 6 | ||||
-rw-r--r-- | arch/sparc64/kernel/prom.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c index 9f22e4ff6015..856659bb1311 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) | |||
777 | cpuid = *id; | 777 | cpuid = *id; |
778 | 778 | ||
779 | #ifdef CONFIG_SMP | 779 | #ifdef CONFIG_SMP |
780 | if (cpuid >= NR_CPUS) | 780 | if (cpuid >= NR_CPUS) { |
781 | printk(KERN_WARNING "Ignoring CPU %d which is " | ||
782 | ">= NR_CPUS (%d)\n", | ||
783 | cpuid, NR_CPUS); | ||
781 | continue; | 784 | continue; |
785 | } | ||
782 | if (!cpu_isset(cpuid, mask)) | 786 | if (!cpu_isset(cpuid, mask)) |
783 | continue; | 787 | continue; |
784 | #else | 788 | #else |
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index d1a78c976cef..0614dff63d7c 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c | |||
@@ -1583,8 +1583,12 @@ static void __init of_fill_in_cpu_data(void) | |||
1583 | ncpus_probed++; | 1583 | ncpus_probed++; |
1584 | 1584 | ||
1585 | #ifdef CONFIG_SMP | 1585 | #ifdef CONFIG_SMP |
1586 | if (cpuid >= NR_CPUS) | 1586 | if (cpuid >= NR_CPUS) { |
1587 | printk(KERN_WARNING "Ignoring CPU %d which is " | ||
1588 | ">= NR_CPUS (%d)\n", | ||
1589 | cpuid, NR_CPUS); | ||
1587 | continue; | 1590 | continue; |
1591 | } | ||
1588 | #else | 1592 | #else |
1589 | /* On uniprocessor we only want the values for the | 1593 | /* On uniprocessor we only want the values for the |
1590 | * real physical cpu the kernel booted onto, however | 1594 | * real physical cpu the kernel booted onto, however |