Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104847
b: refs/heads/master
c: 2f0f2a3
h: refs/heads/master
i:
  104845: 8c34c7b
  104843: b7251af
  104839: 6839cbe
  104831: 02c34dc
v: v3
  • Loading branch information
Denys Vlasenko authored and Rusty Russell committed Jul 22, 2008
1 parent 153b910 commit ccda40b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7f5b67557eac1131ba6532522e3c50eced34238
refs/heads/master: 2f0f2a334bc38b61a9afca951185cd3844ee709d
6 changes: 3 additions & 3 deletions trunk/include/linux/module.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions trunk/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit ccda40b

Please sign in to comment.