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>

authored by Shaohua Li and committed by Ingo Molnar 86b1e8dd 76d1f7bf

+9 -2
+9 -2
arch/x86/kernel/vmlinux.lds.S
··· 34 34 #ifdef CONFIG_X86_32 35 35 OUTPUT_ARCH(i386) 36 36 ENTRY(phys_startup_32) 37 - jiffies = jiffies_64; 38 37 #else 39 38 OUTPUT_ARCH(i386:x86-64) 40 39 ENTRY(phys_startup_64) 41 - jiffies_64 = jiffies; 42 40 #endif 43 41 44 42 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) ··· 140 142 CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) 141 143 142 144 DATA_DATA 145 + /* 146 + * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug. 147 + * This makes jiffies relocatable in such binutils 148 + */ 149 + #ifdef CONFIG_X86_32 150 + jiffies = jiffies_64; 151 + #else 152 + jiffies_64 = jiffies; 153 + #endif 143 154 CONSTRUCTORS 144 155 145 156 /* rarely changed data like cpu maps */