summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-05-24 07:01:38 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-01 15:18:26 +0800
commitc51ac8ac9a82d4883c9b62247cca98195da8cd63 (patch)
treedc871515dea78e965673f76ea42f901a233af84b /arch
parent3c47c685100285be39ff7e347f762480b448b956 (diff)
downloadlinux-3.10-c51ac8ac9a82d4883c9b62247cca98195da8cd63.tar.gz
linux-3.10-c51ac8ac9a82d4883c9b62247cca98195da8cd63.tar.bz2
linux-3.10-c51ac8ac9a82d4883c9b62247cca98195da8cd63.zip
x86, relocs: Add jiffies and jiffies_64 to the relative whitelist
commit ea17e7414bc62e8d3bde8d08e3df1d921c518c17 upstream. The symbol jiffies is created in the linker script as an alias to jiffies_64. Unfortunately this is done outside any section, and apparently GNU ld 2.21 doesn't carry the section with it, so we end up with an absolute symbol and therefore a broken kernel. Add jiffies and jiffies_64 to the whitelist. The most disturbing bit with this discovery is that it shows that we have had multiple linker bugs in this area crossing multiple generations, and have been silently building bad kernels for some time. Link: http://lkml.kernel.org/r/20120524171604.0d98284f3affc643e9714470@canb.auug.org.au Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/tools/relocs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index b8f7c65fc40..b685296d446 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -71,6 +71,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
"__(start|stop)_notes|"
"__end_rodata|"
"__initramfs_start|"
+ "(jiffies|jiffies_64)|"
"_end)$"
};