diff options
| author | Nikola Kotur <kotnick@gmail.com> | 2017-03-02 14:16:40 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-05-03 22:33:52 +0200 |
| commit | 8bba077066d6d0a135b7be1970691522075bf905 (patch) | |
| tree | cde2906e91eaf20bbfcde3a161abe9a24346f3c0 /arch | |
| parent | ecb6c7435f25d6a11fa9d14f407d00286f9642b9 (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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Kconfig.common | 5 | ||||
| -rw-r--r-- | 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 fd443852103c..347bcd444c99 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 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) 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) |