The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: e133f6eac3fa6591384133b2270b24376813d231 Gitweb: https://git.kernel.org/tip/e133f6eac3fa6591384133b2270b24376813d231 Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> AuthorDate: Tue, 03 Dec 2019 16:06:47 -08:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 18 Dec 2019 13:06:53 +01:00 x86/Kconfig: Correct spelling and punctuation End a sentence with a period (aka full stop) in Kconfig help text. Fix minor NUMA-related Kconfig text: - Use capital letters for NUMA acronym. - Hyphenate Non-Uniform. [ bp: Merge into a single patch. ] Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: X86 ML <x86@xxxxxxxxxx> Link: https://lkml.kernel.org/r/443ed0a8-783d-6c7c-3258-e1c44df03fd7@xxxxxxxxxxxxx --- arch/x86/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d7bbed5..97956b5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -477,7 +477,7 @@ config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" depends on SMP ---help--- - This option is needed for the systems that have more than 8 CPUs + This option is needed for the systems that have more than 8 CPUs. config X86_EXTENDED_PLATFORM bool "Support for extended (non-PC) x86 platforms" @@ -1543,12 +1543,12 @@ config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT # Common NUMA Features config NUMA - bool "Numa Memory Allocation and Scheduler Support" + bool "NUMA Memory Allocation and Scheduler Support" depends on SMP depends on X86_64 || (X86_32 && HIGHMEM64G && X86_BIGSMP) default y if X86_BIGSMP ---help--- - Enable NUMA (Non Uniform Memory Access) support. + Enable NUMA (Non-Uniform Memory Access) support. The kernel will try to allocate memory used by a CPU on the local memory controller of the CPU and add some more
|