summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2008-07-22 19:24:27 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-07-22 19:24:27 +1000
commit2f0f2a334bc38b61a9afca951185cd3844ee709d (patch)
treec73089563f51c818ed97dec463408d6ac9cf1e8e
parentf7f5b67557eac1131ba6532522e3c50eced34238 (diff)
downloadop-kernel-dev-2f0f2a334bc38b61a9afca951185cd3844ee709d.zip
op-kernel-dev-2f0f2a334bc38b61a9afca951185cd3844ee709d.tar.gz
module: turn longs into ints for module sizes
This shrinks module.o and each *.ko file. And finally, structure members which hold length of module code (four such members there) and count of symbols are converted from longs to ints. We cannot possibly have a module where 32 bits won't be enough to hold such counts. For one, module loading checks module size for sanity before loading, so such insanely big module will fail that test first. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--include/linux/module.h6
-rw-r--r--kernel/module.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index a860a2c..fce15eb 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -288,10 +288,10 @@ struct module
void *module_core;
/* Here are the sizes of the init and core sections */
- unsigned long init_size, core_size;
+ unsigned int init_size, core_size;
/* The size of the executable code in each section. */
- unsigned long init_text_size, core_text_size;
+ unsigned int init_text_size, core_text_size;
/* The handle returned from unwind_add_table. */
void *unwind_info;
@@ -311,7 +311,7 @@ struct module
#ifdef CONFIG_KALLSYMS
/* We keep the symbol and string tables for kallsyms. */
Elf_Sym *symtab;
- unsigned long num_symtab;
+ unsigned int num_symtab;
char *strtab;
/* Section attributes */
diff --git a/kernel/module.c b/kernel/module.c
index ea95805..5c7eb069 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1567,7 +1567,7 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
}
/* Update size with this section: return offset. */
-static long get_offset(unsigned long *size, Elf_Shdr *sechdr)
+static long get_offset(unsigned int *size, Elf_Shdr *sechdr)
{
long ret;
@@ -2562,7 +2562,7 @@ static int m_show(struct seq_file *m, void *p)
struct module *mod = list_entry(p, struct module, list);
char buf[8];
- seq_printf(m, "%s %lu",
+ seq_printf(m, "%s %u",
mod->name, mod->init_size + mod->core_size);
print_unload_info(m, mod);
OpenPOWER on IntegriCloud