From ccda40b5375bd1b970e526f5a34bc919180e6a51 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 22 Jul 2008 19:24:27 -0500 Subject: [PATCH] --- yaml --- r: 104847 b: refs/heads/master c: 2f0f2a334bc38b61a9afca951185cd3844ee709d h: refs/heads/master i: 104845: 8c34c7b121584fe021431f0fa2a0c6fa5c0397d4 104843: b7251af57ec1f1cb7b9b139879ac828895d1cbb1 104839: 6839cbe34e407843d008fddaff4e99c8a13b4834 104831: 02c34dc488a4aac3759e16d111524cc2e4755f87 v: v3 --- [refs] | 2 +- trunk/include/linux/module.h | 6 +++--- trunk/kernel/module.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index afcb8590dc00..d74c5954998d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7f5b67557eac1131ba6532522e3c50eced34238 +refs/heads/master: 2f0f2a334bc38b61a9afca951185cd3844ee709d diff --git a/trunk/include/linux/module.h b/trunk/include/linux/module.h index a860a2c1f379..fce15ebd0e1c 100644 --- a/trunk/include/linux/module.h +++ b/trunk/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/trunk/kernel/module.c b/trunk/kernel/module.c index ea9580521eb1..5c7eb0695b3c 100644 --- a/trunk/kernel/module.c +++ b/trunk/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);