diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /arch/mips/sgi-ip27/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'arch/mips/sgi-ip27/Kconfig')
| -rw-r--r-- | arch/mips/sgi-ip27/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig index f14ef38646d0..5e960ae9735a 100644 --- a/arch/mips/sgi-ip27/Kconfig +++ b/arch/mips/sgi-ip27/Kconfig | |||
| @@ -33,12 +33,13 @@ config MAPPED_KERNEL | |||
| 33 | depends on SGI_IP27 | 33 | depends on SGI_IP27 |
| 34 | help | 34 | help |
| 35 | Change the way a Linux kernel is loaded into memory on a MIPS64 | 35 | Change the way a Linux kernel is loaded into memory on a MIPS64 |
| 36 | machine. This is required in order to support text replication and | 36 | machine. This is required in order to support text replication on |
| 37 | NUMA. If you need to understand it, read the source code. | 37 | NUMA. If you need to understand it, read the source code. |
| 38 | 38 | ||
| 39 | config REPLICATE_KTEXT | 39 | config REPLICATE_KTEXT |
| 40 | bool "Kernel text replication support" | 40 | bool "Kernel text replication support" |
| 41 | depends on SGI_IP27 | 41 | depends on SGI_IP27 |
| 42 | select MAPPED_KERNEL | ||
| 42 | help | 43 | help |
| 43 | Say Y here to enable replicating the kernel text across multiple | 44 | Say Y here to enable replicating the kernel text across multiple |
| 44 | nodes in a NUMA cluster. This trades memory for speed. | 45 | nodes in a NUMA cluster. This trades memory for speed. |