summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2010-03-05 22:42:46 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 20:26:32 +0100
commit7463e633c5f94792dcff1afefb0d2961318a9d09 (patch)
treedb2ee59033f50dfe2b3ebe48c08cefef86720bc8
parentsmp: fix documentation in include/linux/smp.h (diff)
downloadlinux-7463e633c5f94792dcff1afefb0d2961318a9d09.tar.xz
linux-7463e633c5f94792dcff1afefb0d2961318a9d09.zip
init/main.c: make setup_max_cpus static for !SMP
The only in tree external users of the symbol setup_max_cpus are in arch/x86/. The files ./kernel/alternative.c, ./kernel/visws_quirks.c, and ./mm/kmemcheck/kmemcheck.c are all guarded by CONFIG_SMP being defined. For this case the symbol is an unsigned int and declared as an extern in include/linux/smp.h. When CONFIG_SMP is not defined the symbol setup_max_cpus is a constant value that is only used in init/main.c. Make the symbol static for this case. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index b09a828f38b5..a1ab78ceb4b6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -174,7 +174,7 @@ static int __init maxcpus(char *str)
early_param("maxcpus", maxcpus);
#else
-const unsigned int setup_max_cpus = NR_CPUS;
+static const unsigned int setup_max_cpus = NR_CPUS;
#endif
/*