summaryrefslogtreecommitdiff
path: root/arch/x86/boot/compressed/relocs.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-14 10:19:22 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-05-14 10:19:22 +1000
commit8b6ee04067310a6397476f05f06e52dabd8b0bb6 (patch)
tree022a153b777a9e38f49d46e4fb8f1e6747d4a5f4 /arch/x86/boot/compressed/relocs.c
parentb48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (diff)
parent7c0482e3d055e5de056d3c693b821e39205b99ae (diff)
Merge branch 'merge' into next
We want the irq fixes from the "merge" branch.
Diffstat (limited to 'arch/x86/boot/compressed/relocs.c')
-rw-r--r--arch/x86/boot/compressed/relocs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index d3c0b0277666..fb7117a4ade1 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -403,13 +403,11 @@ static void print_absolute_symbols(void)
for (i = 0; i < ehdr.e_shnum; i++) {
struct section *sec = &secs[i];
char *sym_strtab;
- Elf32_Sym *sh_symtab;
int j;
if (sec->shdr.sh_type != SHT_SYMTAB) {
continue;
}
- sh_symtab = sec->symtab;
sym_strtab = sec->link->strtab;
for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Sym); j++) {
Elf32_Sym *sym;