aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorManeesh Soni <maneesh@in.ibm.com>2006-01-09 23:51:52 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:29 -0500
commit05970d476f2c8aa0f47e4e82473b0551b1e4e6d4 (patch)
tree99708f3c7d8b17b994776ace981ea43208e8649d /arch/x86_64
parent720e1a9f1c3bfa9f72cded56962e7f092fefaaed (diff)
[PATCH] kexec: change CONFIG_PHYSICAL_START dependency
I have heard some complaints about people not finding CONFIG_CRASH_DUMP option and also some objections about its dependency on CONFIG_EMBEDDED. The following patch ends that dependency. I thought of hiding it under CONFIG_KEXEC, but CONFIG_PHYSICAL_START could also be used for some reasons other than kexec/kdump and hence left it visible. I will also update the documentation accordingly. o Following patch removes the config dependency of CONFIG_PHYSICAL_START on CONFIG_EMBEDDED. The reason being CONFIG_CRASH_DUMP option for kdump needs CONFIG_PHYSICAL_START which makes CONFIG_CRASH_DUMP depend on CONFIG_EMBEDDED. It is not always obvious for kdump users to choose CONFIG_EMBEDDED. o It also shifts the palce where this option appears, to make it closer to kexec and kdump options. Signed-off-by: Maneesh Soni <maneesh@in.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Haren Myneni <haren@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/Kconfig31
1 files changed, 19 insertions, 12 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index dd2d116b9ab8..348b4a0d0d6f 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -399,17 +399,6 @@ config X86_MCE_AMD
399 Additional support for AMD specific MCE features such as 399 Additional support for AMD specific MCE features such as
400 the DRAM Error Threshold. 400 the DRAM Error Threshold.
401 401
402config PHYSICAL_START
403 hex "Physical address where the kernel is loaded" if EMBEDDED
404 default "0x100000"
405 help
406 This gives the physical address where the kernel is loaded.
407 Primarily used in the case of kexec on panic where the
408 fail safe kernel needs to run at a different address than
409 the panic-ed kernel.
410
411 Don't change this unless you know what you are doing.
412
413config KEXEC 402config KEXEC
414 bool "kexec system call (EXPERIMENTAL)" 403 bool "kexec system call (EXPERIMENTAL)"
415 depends on EXPERIMENTAL 404 depends on EXPERIMENTAL
@@ -429,11 +418,29 @@ config KEXEC
429 418
430config CRASH_DUMP 419config CRASH_DUMP
431 bool "kernel crash dumps (EXPERIMENTAL)" 420 bool "kernel crash dumps (EXPERIMENTAL)"
432 depends on EMBEDDED
433 depends on EXPERIMENTAL 421 depends on EXPERIMENTAL
434 help 422 help
435 Generate crash dump after being started by kexec. 423 Generate crash dump after being started by kexec.
436 424
425config PHYSICAL_START
426 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
427 default "0x1000000" if CRASH_DUMP
428 default "0x100000"
429 help
430 This gives the physical address where the kernel is loaded. Normally
431 for regular kernels this value is 0x100000 (1MB). But in the case
432 of kexec on panic the fail safe kernel needs to run at a different
433 address than the panic-ed kernel. This option is used to set the load
434 address for kernels used to capture crash dump on being kexec'ed
435 after panic. The default value for crash dump kernels is
436 0x1000000 (16MB). This can also be set based on the "X" value as
437 specified in the "crashkernel=YM@XM" command line boot parameter
438 passed to the panic-ed kernel. Typically this parameter is set as
439 crashkernel=64M@16M. Please take a look at
440 Documentation/kdump/kdump.txt for more details about crash dumps.
441
442 Don't change this unless you know what you are doing.
443
437config SECCOMP 444config SECCOMP
438 bool "Enable seccomp to safely compute untrusted bytecode" 445 bool "Enable seccomp to safely compute untrusted bytecode"
439 depends on PROC_FS 446 depends on PROC_FS