aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-06-28 07:26:46 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 17:59:04 -0400
commit84860f9979804cfd97638ce0ec9d583daf338e0d (patch)
tree81fe1ffa2d7cd2ed4757703dae5fadc40ea01213 /kernel/module.c
parentf71d20e961474dde77e6558396efb93d6ac80a4b (diff)
[PATCH] load_module() cleanup
Undo bizarre declaration in load_module(). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 03b738172a8c..99c022ac3d21 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1458,12 +1458,27 @@ static struct module *load_module(void __user *umod,
1458 Elf_Ehdr *hdr; 1458 Elf_Ehdr *hdr;
1459 Elf_Shdr *sechdrs; 1459 Elf_Shdr *sechdrs;
1460 char *secstrings, *args, *modmagic, *strtab = NULL; 1460 char *secstrings, *args, *modmagic, *strtab = NULL;
1461 unsigned int i, symindex = 0, strindex = 0, setupindex, exindex, 1461 unsigned int i;
1462 exportindex, modindex, obsparmindex, infoindex, gplindex, 1462 unsigned int symindex = 0;
1463 crcindex, gplcrcindex, versindex, pcpuindex, gplfutureindex, 1463 unsigned int strindex = 0;
1464 gplfuturecrcindex, unwindex = 0; 1464 unsigned int setupindex;
1465 unsigned int unusedindex, unusedcrcindex, unusedgplindex, 1465 unsigned int exindex;
1466 unusedgplcrcindex; 1466 unsigned int exportindex;
1467 unsigned int modindex;
1468 unsigned int obsparmindex;
1469 unsigned int infoindex;
1470 unsigned int gplindex;
1471 unsigned int crcindex;
1472 unsigned int gplcrcindex;
1473 unsigned int versindex;
1474 unsigned int pcpuindex;
1475 unsigned int gplfutureindex;
1476 unsigned int gplfuturecrcindex;
1477 unsigned int unwindex = 0;
1478 unsigned int unusedindex;
1479 unsigned int unusedcrcindex;
1480 unsigned int unusedgplindex;
1481 unsigned int unusedgplcrcindex;
1467 struct module *mod; 1482 struct module *mod;
1468 long err = 0; 1483 long err = 0;
1469 void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ 1484 void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */