From ecd0a7c4a14542241f8af25b9b07ff7e8805fadf Mon Sep 17 00:00:00 2001 From: Philipp Marek Date: Sat, 20 Oct 2007 02:46:58 +0200 Subject: [PATCH] --- yaml --- r: 71884 b: refs/heads/master c: ad3d0a3827a3ce45ee4141de81be7375157b42de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 4 ++-- trunk/mm/Kconfig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 38ae2caa1967..7fab53ecb009 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2de206d8f09c8b01d3721f860c28258838953a18 +refs/heads/master: ad3d0a3827a3ce45ee4141de81be7375157b42de diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index d0a4ea1ba14d..7627e9bd8b44 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -392,7 +392,7 @@ config X86_MCE_NONFATAL will look at the machine check registers to see if anything happened. Non-fatal problems automatically get corrected (but still logged). Disable this if you don't want to see these messages. - Seeing the messages this option prints out may be indicative of dying hardware, + Seeing the messages this option prints out may be indicative of dying or out-of-spec (ie, overclocked) hardware. This option only does something on certain CPUs. (AMD Athlon/Duron and Intel Pentium 4) @@ -631,7 +631,7 @@ config NUMA default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT) help - NUMA support for i386. This is currently high experimental + NUMA support for i386. This is currently highly experimental and should be only used for kernel development. It might also cause boot failures. diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index b1f03b0eb7f1..c070ec0c15bf 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -37,7 +37,7 @@ config DISCONTIGMEM_MANUAL in their physical address spaces, and this option provides more efficient handling of these holes. However, the vast majority of hardware has quite flat address spaces, and - can have degraded performance from extra overhead that + can have degraded performance from the extra overhead that this option imposes. Many NUMA configurations will have this as the only option.