The patch titled init/main.c: make setup_max_cpus static for !SMP has been added to the -mm tree. Its filename is init-mainc-make-setup_max_cpus-static-for-smp.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: init/main.c: make setup_max_cpus static for !SMP From: H Hartley Sweeten <hartleys@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN init/main.c~init-mainc-make-setup_max_cpus-static-for-smp init/main.c --- a/init/main.c~init-mainc-make-setup_max_cpus-static-for-smp +++ a/init/main.c @@ -161,7 +161,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 /* _ Patches currently in -mm which might be from hartleys@xxxxxxxxxxxxxxxxxxx are linux-next.patch init-initramfsc-fix-symbol-shadows-an-earlier-one-noise.patch nodemaskh-remove-macro-any_online_node.patch init-mainc-make-setup_max_cpus-static-for-smp.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html