git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
um
/
Kconfig.common
diff --git
a/arch/um/Kconfig.common
b/arch/um/Kconfig.common
index ed9c5b5ff028947061bd8a86949c58e9456e98a3..85f6dd204ab616a7fdd6bc080310bfc4967c1ef5 100644
(file)
--- 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