summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-04 12:14:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-04 12:14:46 -0700
commitb8ec322784f732562902503d70bf1f5e907b28c0 (patch)
treef7ceda585fa4f0d7954d704b9ddebd982985963e /arch
parent2165f631f0e1d4e9a1ee425ef05cb727352285e0 (diff)
parentcc65f1ec192dc54de57483194502e9fa00934c39 (diff)
downloadlinux-b8ec322784f732562902503d70bf1f5e907b28c0.tar.gz
linux-b8ec322784f732562902503d70bf1f5e907b28c0.tar.bz2
linux-b8ec322784f732562902503d70bf1f5e907b28c0.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86 setup: correct segfault in generation of 32-bit reloc kernel
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/compressed/relocs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index a1310c52fc0c..857e492c571e 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -492,7 +492,7 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
continue;
}
sh_symtab = sec_symtab->symtab;
- sym_strtab = sec->link->strtab;
+ sym_strtab = sec_symtab->link->strtab;
for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
Elf32_Rel *rel;
Elf32_Sym *sym;