summaryrefslogtreecommitdiff
path: root/kernel/module.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-06-28 04:26:46 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 14:59:04 -0700
commit84860f9979804cfd97638ce0ec9d583daf338e0d (patch)
tree81fe1ffa2d7cd2ed4757703dae5fadc40ea01213 /kernel/module.c
parentf71d20e961474dde77e6558396efb93d6ac80a4b (diff)
downloadlwn-84860f9979804cfd97638ce0ec9d583daf338e0d.tar.gz
lwn-84860f9979804cfd97638ce0ec9d583daf338e0d.zip
[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,
Elf_Ehdr *hdr;
Elf_Shdr *sechdrs;
char *secstrings, *args, *modmagic, *strtab = NULL;
- unsigned int i, symindex = 0, strindex = 0, setupindex, exindex,
- exportindex, modindex, obsparmindex, infoindex, gplindex,
- crcindex, gplcrcindex, versindex, pcpuindex, gplfutureindex,
- gplfuturecrcindex, unwindex = 0;
- unsigned int unusedindex, unusedcrcindex, unusedgplindex,
- unusedgplcrcindex;
+ unsigned int i;
+ unsigned int symindex = 0;
+ unsigned int strindex = 0;
+ unsigned int setupindex;
+ unsigned int exindex;
+ unsigned int exportindex;
+ unsigned int modindex;
+ unsigned int obsparmindex;
+ unsigned int infoindex;
+ unsigned int gplindex;
+ unsigned int crcindex;
+ unsigned int gplcrcindex;
+ unsigned int versindex;
+ unsigned int pcpuindex;
+ unsigned int gplfutureindex;
+ unsigned int gplfuturecrcindex;
+ unsigned int unwindex = 0;
+ unsigned int unusedindex;
+ unsigned int unusedcrcindex;
+ unsigned int unusedgplindex;
+ unsigned int unusedgplcrcindex;
struct module *mod;
long err = 0;
void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */