From 72e5525765ee01d72a9b92fab78ecea883ae7fdd Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 1 Feb 2006 03:06:29 -0800 Subject: [PATCH] [PATCH] uml: avoid "CONFIG_NR_CPUS undeclared" bogus error messages Olaf Hering Olaf reported UML doesn't build for him with a clear analisys of what happened - we're using NR_CPUS in files linked against glibc headers. Seems like it defines CONFIG_SMP but not CONFIG_NR_CPUS, so we get CONFIG_NR_CPUS undeclared. The fix is to move the declaration away from that header file and move it in asm-um headers, and to add that header where needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/include/kern_util.h | 2 -- arch/um/kernel/reboot.c | 1 + include/asm-um/smp.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index c649108a9e9..07176d92e1c 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h @@ -31,8 +31,6 @@ extern int timer_irq_inited; extern int jail; extern int nsyscalls; -extern struct task_struct *idle_threads[NR_CPUS]; - #define UML_ROUND_DOWN(addr) ((void *)(((unsigned long) addr) & PAGE_MASK)) #define UML_ROUND_UP(addr) \ UML_ROUND_DOWN(((unsigned long) addr) + PAGE_SIZE - 1) diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c index 6f1a3a28811..3ef73bf2e78 100644 --- a/arch/um/kernel/reboot.c +++ b/arch/um/kernel/reboot.c @@ -5,6 +5,7 @@ #include "linux/module.h" #include "linux/sched.h" +#include "asm/smp.h" #include "user_util.h" #include "kern_util.h" #include "kern.h" diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h index d879eba2b52..aeda6657f36 100644 --- a/include/asm-um/smp.h +++ b/include/asm-um/smp.h @@ -23,6 +23,8 @@ extern inline void smp_cpus_done(unsigned int maxcpus) { } +extern struct task_struct *idle_threads[NR_CPUS]; + #endif #endif -- 2.20.1