Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

x86: revert CONFIG_RELOCATABLE=y defconfig change

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>
Vegard Nossum 16 years ago
parent
ad07e914e6
commit
f269b07e86
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      arch/x86/configs/i386_defconfig
  2. 1 1
      arch/x86/configs/x86_64_defconfig

+ 1 - 1
arch/x86/configs/i386_defconfig
View File 

@@ -298,7 +298,7 @@ CONFIG_KEXEC=y
 
 CONFIG_CRASH_DUMP=y
 
 CONFIG_CRASH_DUMP=y
 
 # CONFIG_KEXEC_JUMP is not set
 
 # CONFIG_KEXEC_JUMP is not set
 
 CONFIG_PHYSICAL_START=0x1000000
 
 CONFIG_PHYSICAL_START=0x1000000
 
-CONFIG_RELOCATABLE=y
 
+# CONFIG_RELOCATABLE is not set
 
 CONFIG_PHYSICAL_ALIGN=0x200000
 
 CONFIG_PHYSICAL_ALIGN=0x200000
 
 CONFIG_HOTPLUG_CPU=y
 
 CONFIG_HOTPLUG_CPU=y
 
 # CONFIG_COMPAT_VDSO is not set
 
 # CONFIG_COMPAT_VDSO is not set

+ 1 - 1
arch/x86/configs/x86_64_defconfig
View File 

@@ -298,7 +298,7 @@ CONFIG_SCHED_HRTICK=y
 
 CONFIG_KEXEC=y
 
 CONFIG_KEXEC=y
 
 CONFIG_CRASH_DUMP=y
 
 CONFIG_CRASH_DUMP=y
 
 CONFIG_PHYSICAL_START=0x1000000
 
 CONFIG_PHYSICAL_START=0x1000000
 
-CONFIG_RELOCATABLE=y
 
+# CONFIG_RELOCATABLE is not set
 
 CONFIG_PHYSICAL_ALIGN=0x200000
 
 CONFIG_PHYSICAL_ALIGN=0x200000
 
 CONFIG_HOTPLUG_CPU=y
 
 CONFIG_HOTPLUG_CPU=y
 
 # CONFIG_COMPAT_VDSO is not set
 
 # CONFIG_COMPAT_VDSO is not set