diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:06:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:06:49 -0700 |
commit | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 (patch) | |
tree | 5cba2f98482e4612e4daf8e57e4e50a24a273fe9 /arch/x86/Kconfig | |
parent | e990c77d06dbacc8e5c5edd2c4a1005d318a4fa6 (diff) | |
parent | 9ea77bdb39b62c9bf9fd3cdd1c25a9420bccd380 (diff) | |
download | kernel_samsung_espresso10-781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9.zip kernel_samsung_espresso10-781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9.tar.gz kernel_samsung_espresso10-781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9.tar.bz2 |
Merge branch 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-bios-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, bios: Make the x86 early memory reservation a kernel option
x86, bios: By default, reserve the low 64K for all BIOSes
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a1bd569..b867649 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1341,25 +1341,34 @@ config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK Set whether the default state of memory_corruption_check is on or off. -config X86_RESERVE_LOW_64K - bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen" - default y - ---help--- - Reserve the first 64K of physical RAM on BIOSes that are known - to potentially corrupt that memory range. A numbers of BIOSes are - known to utilize this area during suspend/resume, so it must not - be used by the kernel. - - Set this to N if you are absolutely sure that you trust the BIOS - to get all its memory reservations and usages right. - - If you have doubts about the BIOS (e.g. suspend/resume does not - work or there's kernel crashes after certain hardware hotplug - events) and it's not AMI or Phoenix, then you might want to enable - X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical - corruption patterns. - - Say Y if unsure. +config X86_RESERVE_LOW + int "Amount of low memory, in kilobytes, to reserve for the BIOS" + default 64 + range 4 640 + ---help--- + Specify the amount of low memory to reserve for the BIOS. + + The first page contains BIOS data structures that the kernel + must not use, so that page must always be reserved. + + By default we reserve the first 64K of physical RAM, as a + number of BIOSes are known to corrupt that memory range + during events such as suspend/resume or monitor cable + insertion, so it must not be used by the kernel. + + You can set this to 4 if you are absolutely sure that you + trust the BIOS to get all its memory reservations and usages + right. If you know your BIOS have problems beyond the + default 64K area, you can set this to 640 to avoid using the + entire low memory range. + + If you have doubts about the BIOS (e.g. suspend/resume does + not work or there's kernel crashes after certain hardware + hotplug events) then you might want to enable + X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check + typical corruption patterns. + + Leave this to the default value of 64 if you are unsure. config MATH_EMULATION bool |