summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2011-01-18 08:57:49 +0800
committerIngo Molnar <mingo@elte.hu>2011-01-18 09:05:33 +0100
commit86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf (patch)
tree8dd49e97b8bec76b53798fe35a423dd20596603f
parent76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9 (diff)
downloadop-kernel-dev-86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf.zip
op-kernel-dev-86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf.tar.gz
x86: Make relocatable kernel work with new binutils
The CONFIG_RELOCATABLE=y option is broken with new binutils, which will make boot panic. According to Lu Hongjiu, the affected binutils are from 2.20.51.0.12 to 2.21.51.0.3, which are release since Oct 22 this year. At least ubuntu 10.10 is using such binutils. See: http://sourceware.org/bugzilla/show_bug.cgi?id=12327 The reason of the boot panic is that we have 'jiffies = jiffies_64;' in vmlinux.lds.S. The jiffies isn't in any section. In kernel build, there is warning saying jiffies is an absolute address and can't be relocatable. At runtime, jiffies will have virtual address 0. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Cc: Lu Hongjiu<hongjiu.lu@intel.com> Cc: Huang Ying <ying.huang@intel.com> Cc: Sam Ravnborg <sam@ravnborg.org> LKML-Reference: <1295312269.1949.725.camel@sli10-conroe> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/vmlinux.lds.S11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bf47007..b34ab80 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -34,11 +34,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
#ifdef CONFIG_X86_32
OUTPUT_ARCH(i386)
ENTRY(phys_startup_32)
-jiffies = jiffies_64;
#else
OUTPUT_ARCH(i386:x86-64)
ENTRY(phys_startup_64)
-jiffies_64 = jiffies;
#endif
#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
@@ -142,6 +140,15 @@ SECTIONS
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
DATA_DATA
+ /*
+ * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug.
+ * This makes jiffies relocatable in such binutils
+ */
+#ifdef CONFIG_X86_32
+ jiffies = jiffies_64;
+#else
+ jiffies_64 = jiffies;
+#endif
CONSTRUCTORS
/* rarely changed data like cpu maps */
OpenPOWER on IntegriCloud