projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm64
/
Kconfig
diff --git
a/arch/arm64/Kconfig
b/arch/arm64/Kconfig
index
88c8b6c
..
6d4dd22
100644
(file)
--- a/
arch/arm64/Kconfig
+++ b/
arch/arm64/Kconfig
@@
-159,8
+159,7
@@
config NR_CPUS
range 2 32
depends on SMP
# These have to remain sorted largest to smallest
- default "8" if ARCH_XGENE
- default "4"
+ default "8"
config HOTPLUG_CPU
bool "Support for hot-pluggable CPUs"