powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build

PATCH New Anton Blanchard 1 participant 1 message Nov 12, 2012 PowerPC

Share & tools

Anton Blanchard

author

2012-11-12 05:01 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

Cc <[email protected]>

---

arch/powerpc/kernel/head_64.S +1 -1

Index: 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