aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikola Kotur <kotnick@gmail.com>2017-03-02 08:16:40 -0500
committerRichard Weinberger <richard@nod.at>2017-05-03 16:33:52 -0400
commit8bba077066d6d0a135b7be1970691522075bf905 (patch)
treecde2906e91eaf20bbfcde3a161abe9a24346f3c0
parentecb6c7435f25d6a11fa9d14f407d00286f9642b9 (diff)
um: Set number of CPUs
Define NR_CPUS required by the timer subsystem. Fixes this make warning: scripts/kconfig/conf --oldconfig arch/x86/um/Kconfig kernel/time/Kconfig:155:warning: range is invalid Signed-off-by: Nikola Kotur <kotnick@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at>
-rw-r--r--arch/um/Kconfig.common5
-rw-r--r--arch/um/os-Linux/skas/process.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index fd443852103c..347bcd444c99 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -62,3 +62,8 @@ config HZ
62config SUBARCH 62config SUBARCH
63 string 63 string
64 option env="SUBARCH" 64 option env="SUBARCH"
65
66config NR_CPUS
67 int
68 range 1 1
69 default 1
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 23025d645160..92f7ee14b10e 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -233,9 +233,6 @@ static int userspace_tramp(void *stack)
233 return 0; 233 return 0;
234} 234}
235 235
236/* Each element set once, and only accessed by a single processor anyway */
237#undef NR_CPUS
238#define NR_CPUS 1
239int userspace_pid[NR_CPUS]; 236int userspace_pid[NR_CPUS];
240 237
241int start_userspace(unsigned long stub_stack) 238int start_userspace(unsigned long stub_stack)