From 8bba077066d6d0a135b7be1970691522075bf905 Mon Sep 17 00:00:00 2001
From: Nikola Kotur <kotnick@gmail.com>
Date: Thu, 2 Mar 2017 14:16:40 +0100
Subject: [PATCH] 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>
---
arch/um/Kconfig.common | 5 +++++
arch/um/os-Linux/skas/process.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index fd443852103c9..347bcd444c990 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -62,3 +62,8 @@ config HZ
config SUBARCH
string
option env="SUBARCH"
+
+config NR_CPUS
+ int
+ range 1 1
+ default 1
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 23025d6451601..92f7ee14b10ed 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)
return 0;
}
-/* Each element set once, and only accessed by a single processor anyway */
-#undef NR_CPUS
-#define NR_CPUS 1
int userspace_pid[NR_CPUS];
int start_userspace(unsigned long stub_stack)
--
GitLab