Patchwork powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build

login
register
mail settings
Submitter Anton Blanchard
Date Nov. 12, 2012, 5:01 a.m.
Message ID <20121112160105.3500c602@kryten>
Download mbox | patch
Permalink /patch/198318/
State Accepted, archived
Commit 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Anton Blanchard - Nov. 12, 2012, 5:01 a.m.
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>
---

Patch

Index: b/arch/powerpc/kernel/head_64.S
===================================================================
--- 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