diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 20:20:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-13 20:20:02 +0300 |
| commit | ec059019b7e6ae3926a8e1dec02a62d64dd8c060 (patch) | |
| tree | ab60e0f2d21154dda05f58af310a66c94179d70a /arch/um/Kconfig.common | |
| parent | 1251704a631b62591ad1d1b6ead252e9e597d5f5 (diff) | |
| parent | ce4586063f1af780b1c6b7e344907e6f9c1ba59a (diff) | |
| download | linux-ec059019b7e6ae3926a8e1dec02a62d64dd8c060.tar.xz | |
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"No new stuff, just fixes"
* 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Add missing NR_CPUS include
um: Fix to call read_initrd after init_bootmem
um: Include kbuild.h instead of duplicating its macros
um: Fix PTRACE_POKEUSER on x86_64
um: Set number of CPUs
um: Fix _print_addr()
Diffstat (limited to 'arch/um/Kconfig.common')
| -rw-r--r-- | arch/um/Kconfig.common | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index ed9c5b5ff028..85f6dd204ab6 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common @@ -57,3 +57,8 @@ config HZ config SUBARCH string option env="SUBARCH" + +config NR_CPUS + int + range 1 1 + default 1 |