diff options
| author | Anton Blanchard <anton@samba.org> | 2012-11-11 14:01:05 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:03 -0500 |
| commit | 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (patch) | |
| tree | e6535b7c050150439312295525d0282022215637 /arch | |
| parent | c674e703cb1028e468527163074810b4a17bf379 (diff) | |
powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build
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>
Cc: <stable@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -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 694e3fa78857..11a4df9dd580 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -422,7 +422,7 @@ _STATIC(__after_prom_start) | |||
| 422 | tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */ | 422 | tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */ |
| 423 | #endif | 423 | #endif |
| 424 | 424 | ||
| 425 | #ifdef CONFIG_CRASH_DUMP | 425 | #ifdef CONFIG_RELOCATABLE |
| 426 | /* | 426 | /* |
| 427 | * Check if the kernel has to be running as relocatable kernel based on the | 427 | * Check if the kernel has to be running as relocatable kernel based on the |
| 428 | * variable __run_at_load, if it is set the kernel is treated as relocatable | 428 | * variable __run_at_load, if it is set the kernel is treated as relocatable |