Skip to content

Commit 11ee7e9

Browse files
antonblanchardozbenh
authored andcommitted
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]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
1 parent c674e70 commit 11ee7e9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/head_64.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ _STATIC(__after_prom_start)
422422
tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */
423423
#endif
424424

425-
#ifdef CONFIG_CRASH_DUMP
425+
#ifdef CONFIG_RELOCATABLE
426426
/*
427427
* Check if the kernel has to be running as relocatable kernel based on the
428428
* variable __run_at_load, if it is set the kernel is treated as relocatable

0 commit comments

Comments
 (0)