diff options
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2f..a1a9021146bc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -419,35 +419,19 @@ config PARAVIRT | |||
419 | 419 | ||
420 | endif | 420 | endif |
421 | 421 | ||
422 | config MEMTEST_BOOTPARAM | 422 | config MEMTEST |
423 | bool "Memtest boot parameter" | 423 | bool "Memtest" |
424 | depends on X86_64 | 424 | depends on X86_64 |
425 | default y | 425 | default y |
426 | help | 426 | help |
427 | This option adds a kernel parameter 'memtest', which allows memtest | 427 | This option adds a kernel parameter 'memtest', which allows memtest |
428 | to be disabled at boot. If this option is selected, memtest | 428 | to be set. |
429 | functionality can be disabled with memtest=0 on the kernel | 429 | memtest=0, mean disabled; -- default |
430 | command line. The purpose of this option is to allow a single | 430 | memtest=1, mean do 1 test pattern; |
431 | kernel image to be distributed with memtest built in, but not | 431 | ... |
432 | necessarily enabled. | 432 | memtest=4, mean do 4 test patterns. |
433 | |||
434 | If you are unsure how to answer this question, answer Y. | 433 | If you are unsure how to answer this question, answer Y. |
435 | 434 | ||
436 | config MEMTEST_BOOTPARAM_VALUE | ||
437 | int "Memtest boot parameter default value (0-4)" | ||
438 | depends on MEMTEST_BOOTPARAM | ||
439 | range 0 4 | ||
440 | default 0 | ||
441 | help | ||
442 | This option sets the default value for the kernel parameter | ||
443 | 'memtest', which allows memtest to be disabled at boot. If this | ||
444 | option is set to 0 (zero), the memtest kernel parameter will | ||
445 | default to 0, disabling memtest at bootup. If this option is | ||
446 | set to 4, the memtest kernel parameter will default to 4, | ||
447 | enabling memtest at bootup, and use that as pattern number. | ||
448 | |||
449 | If you are unsure how to answer this question, answer 0. | ||
450 | |||
451 | config ACPI_SRAT | 435 | config ACPI_SRAT |
452 | def_bool y | 436 | def_bool y |
453 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 437 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |