diff --git a/[refs] b/[refs] index 035e916ed82f..79c7b0ce138d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9ba9a3b3897561d01e04cd21433746df46548c0 +refs/heads/master: 04103609322daca31197068e310ba8037ecd3470 diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index e18eb79bf855..9fad9df86626 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -429,10 +429,10 @@ config CRASH_DUMP config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) default "0x1000000" if CRASH_DUMP - default "0x100000" + default "0x200000" help This gives the physical address where the kernel is loaded. Normally - for regular kernels this value is 0x100000 (1MB). But in the case + for regular kernels this value is 0x200000 (2MB). But in the case of kexec on panic the fail safe kernel needs to run at a different address than the panic-ed kernel. This option is used to set the load address for kernels used to capture crash dump on being kexec'ed