On Wed, Mar 23, 2011 at 02:00:29AM +0000, Linux Kernel Mailing List wrote: > Gitweb: http://git.kernel.org/linus/34db18a054c600b6f81787165669dc572fe4de25 > Commit: 34db18a054c600b6f81787165669dc572fe4de25 > Parent: fa9ee9c4b9885dfdf8eccac19b8b4fc8a7c53288 > Author: Amerigo Wang <amwang@xxxxxxxxxx> > AuthorDate: Tue Mar 22 16:34:06 2011 -0700 > Committer: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > CommitDate: Tue Mar 22 17:44:11 2011 -0700 > > smp: move smp setup functions to kernel/smp.c > > Move setup_nr_cpu_ids(), smp_init() and some other SMP boot parameter > setup functions from init/main.c to kenrel/smp.c, saves some #ifdef > CONFIG_SMP. > > Signed-off-by: WANG Cong <amwang@xxxxxxxxxx> > Cc: Rakib Mullick <rakib.mullick@xxxxxxxxx> > Cc: David Howells <dhowells@xxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxx> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> > Cc: Tejun Heo <tj@xxxxxxxxxx> > Cc: Arnd Bergmann <arnd@xxxxxxxx> > Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > --- > include/linux/smp.h | 2 + > init/main.c | 90 +-------------------------------------------------- > kernel/smp.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 84 insertions(+), 89 deletions(-) > > diff --git a/include/linux/smp.h b/include/linux/smp.h > index 6dc95ca..48159dd 100644 > --- a/include/linux/smp.h > +++ b/include/linux/smp.h > @@ -114,6 +114,8 @@ int on_each_cpu(smp_call_func_t func, void *info, int wait); > void smp_prepare_boot_cpu(void); > > extern unsigned int setup_max_cpus; > +extern void __init setup_nr_cpu_ids(void); > +extern void __init smp_init(void); This causes a build error on s390. The patch below will fix it. Cc'ed linux-arch just in case other architectures are affected as well. Subject: [PATCH] smp: add missing init.h include From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> 34db18a05 "smp: move smp setup functions to kernel/smp.c" causes this build error on s390 because of a missing init.h include: CC arch/s390/kernel/asm-offsets.s In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/spinlock.h:14:0, from include/linux/spinlock.h:87, from include/linux/seqlock.h:29, from include/linux/time.h:8, from include/linux/timex.h:56, from include/linux/sched.h:57, from arch/s390/kernel/asm-offsets.c:10: include/linux/smp.h:117:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'setup_nr_cpu_ids' include/linux/smp.h:118:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'smp_init' Fix it by adding the include statement. Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> --- include/linux/smp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/smp.h b/include/linux/smp.h index 48159dd..74243c8 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -10,6 +10,7 @@ #include <linux/types.h> #include <linux/list.h> #include <linux/cpumask.h> +#include <linux/init.h> extern void cpu_idle(void); -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
