diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
| commit | 3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch) | |
| tree | 3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /arch/ia64/Kconfig | |
| parent | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
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 | |||
| 258 | int "Maximum number of CPUs (2-1024)" | 258 | int "Maximum number of CPUs (2-1024)" |
| 259 | range 2 1024 | 259 | range 2 1024 |
| 260 | depends on SMP | 260 | depends on SMP |
| 261 | default "64" | 261 | default "1024" |
| 262 | help | 262 | help |
| 263 | You should set this to the number of CPUs in your system, but | 263 | You should set this to the number of CPUs in your system, but |
| 264 | keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but | 264 | keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but |
| @@ -354,7 +354,7 @@ config NUMA | |||
| 354 | config NODES_SHIFT | 354 | config NODES_SHIFT |
| 355 | int "Max num nodes shift(3-10)" | 355 | int "Max num nodes shift(3-10)" |
| 356 | range 3 10 | 356 | range 3 10 |
| 357 | default "8" | 357 | default "10" |
| 358 | depends on NEED_MULTIPLE_NODES | 358 | depends on NEED_MULTIPLE_NODES |
| 359 | help | 359 | help |
| 360 | This option specifies the maximum number of nodes in your SSI system. | 360 | This option specifies the maximum number of nodes in your SSI system. |