x86: revert CONFIG_RELOCATABLE=y defconfig change
authorVegard Nossum <vegard.nossum@gmail.com>
Thu, 18 Dec 2008 17:35:06 +0000 (18:35 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 19:57:29 +0000 (20:57 +0100)
This commit:

commit 5cb04df8d3f03e37a19f2502591a84156be71772
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun May 4 19:49:04 2008 +0200

   x86: defconfig updates

changed CONFIG_RELOCATABLE from n to y, which may lead to a mismatch
between the vmlinux debug information and the runtime location of the
kernel, even when the bootloader does not relocate the kernel.

Revert the specific change. Works for me with GRUB and qemu.

Reference: http://lkml.org/lkml/2008/11/25/243

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/configs/i386_defconfig
arch/x86/configs/x86_64_defconfig

index 71fc39c70782bd3f07627e2c0286d5058aca780c..b30a08ed8eb48b8f64f9c79cc5e62f11d63ec669 100644 (file)
@@ -298,7 +298,7 @@ CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set
index b38bbabc170612bb01cd2588679832a9c6cbef3a..0e7dbc0a3e460e2934887c8c0d744c0515f66c6d 100644 (file)
@@ -298,7 +298,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_COMPAT_VDSO is not set