diff options
| author | Anton Blanchard <anton@samba.org> | 2012-11-11 19:01:05 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:50:42 -0800 |
| commit | 55800cd51f64300f66c9c0e6eda015e1d6626a57 (patch) | |
| tree | c96fc877889a1c4c6112d3da39cb3d8d0bb092c0 /arch/powerpc | |
| parent | 8fcd6a440a3d01216bd6d88ce00e7353b1813ec6 (diff) | |
| download | linux-3.10-55800cd51f64300f66c9c0e6eda015e1d6626a57.tar.gz linux-3.10-55800cd51f64300f66c9c0e6eda015e1d6626a57.tar.bz2 linux-3.10-55800cd51f64300f66c9c0e6eda015e1d6626a57.zip | |
powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build
commit 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 upstream.
If we build a kernel with CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n,
the kernel fails when we run at a non zero offset. It turns out
we were incorrectly wrapping some of the relocatable kernel code
with CONFIG_CRASH_DUMP.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 58bddee8e1e..9e07bd038dd 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -422,7 +422,7 @@ _STATIC(__after_prom_start) tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */ #endif -#ifdef CONFIG_CRASH_DUMP +#ifdef CONFIG_RELOCATABLE /* * Check if the kernel has to be running as relocatable kernel based on the * variable __run_at_load, if it is set the kernel is treated as relocatable |