diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/ia64/Kconfig | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
| download | blackbird-op-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.gz blackbird-op-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 47de9ee6bcd6..674de8943478 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -258,7 +258,7 @@ config NR_CPUS int "Maximum number of CPUs (2-1024)" range 2 1024 depends on SMP - default "64" + default "1024" help You should set this to the number of CPUs in your system, but keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but @@ -354,7 +354,7 @@ config NUMA config NODES_SHIFT int "Max num nodes shift(3-10)" range 3 10 - default "8" + default "10" depends on NEED_MULTIPLE_NODES help This option specifies the maximum number of nodes in your SSI system. |
