powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Anton Blanchard and committed by

Benjamin Herrenschmidt 13 years ago 11ee7e99 c674e703

+1 -1

1 changed file

expand all

arch

powerpc

kernel

head_64.S

+1 -1

arch/powerpc/kernel/head_64.S

··· 422 422 tovirt(r6,r6) /* on booke, we already run at PAGE_OFFSET */ 423 423 #endif 424 424 425 - #ifdef CONFIG_CRASH_DUMP 425 + #ifdef CONFIG_RELOCATABLE 426 426 /* 427 427 * Check if the kernel has to be running as relocatable kernel based on the 428 428 * variable __run_at_load, if it is set the kernel is treated as relocatable