Commit 5279bb94 authored by Kai Germaschewski's avatar Kai Germaschewski

Hand merge

parents 797886bf 46cfe05f
......@@ -17,6 +17,7 @@
#include <linux/tty_flip.h>
#include <linux/module.h>
#include <linux/usb.h>
#include <asm/uaccess.h>
#ifdef CONFIG_USB_SERIAL_DEBUG
static int debug = 1;
......
......@@ -233,7 +233,7 @@ struct module
#ifdef CONFIG_KALLSYMS
/* We keep the symbol and string tables for kallsyms. */
Elf_Sym *symtab;
unsigned long num_kallsyms;
unsigned long num_symtab;
char *strtab;
#endif
......
......@@ -839,12 +839,13 @@ static inline int check_modstruct_version(Elf_Shdr *sechdrs,
unsigned int versindex,
struct module *mod)
{
unsigned int i;
struct kernel_symbol_group *ksg;
const unsigned long *crc;
struct module *owner;
if (!__find_symbol("struct_module", &ksg, &i, 1))
if (!__find_symbol("struct_module", &owner, &crc, 1))
BUG();
return check_version(sechdrs, versindex, "struct_module", mod, ksg, i);
return check_version(sechdrs, versindex, "struct_module", mod,
crc);
}
/* First part is kernel version, which we ignore. */
......@@ -1283,7 +1284,8 @@ static struct module *load_module(void *umod,
mod->gpl_crcs = (void *)sechdrs[gplcrcindex].sh_addr;
#ifdef CONFIG_MODVERSIONS
if ((mod->num_kallsyms && !crcindex) || (mod->num_gpl_syms && !gplcrcindex)) {
if ((mod->num_syms && !crcindex) ||
(mod->num_gpl_syms && !gplcrcindex)) {
printk(KERN_WARNING "%s: No versions for exported symbols."
" Tainting kernel.\n", mod->name);
tainted |= TAINT_FORCED_MODULE;
......@@ -1309,7 +1311,7 @@ static struct module *load_module(void *umod,
#ifdef CONFIG_KALLSYMS
mod->symtab = (void *)sechdrs[symindex].sh_addr;
mod->num_kallsyms = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
mod->strtab = (void *)sechdrs[strindex].sh_addr;
#endif
err = module_finalize(hdr, sechdrs, mod);
......@@ -1452,7 +1454,7 @@ static const char *get_ksymbol(struct module *mod,
/* Scan for closest preceeding symbol, and next symbol. (ELF
starts real symbols at 1). */
for (i = 1; i < mod->num_kallsyms; i++) {
for (i = 1; i < mod->num_symtab; i++) {
if (mod->symtab[i].st_shndx == SHN_UNDEF)
continue;
......
......@@ -35,10 +35,11 @@ targets += $(modules)
# Compile version info for unresolved symbols
quiet_cmd_cc_o_c = CC $@
cmd_cc_o_c = $(CC) $(CFLAGS) $(CFLAGS_MODULE) -c -o $@ $<
cmd_cc_o_c = $(CC) -Wp,-MD,$(depfile) $(CFLAGS) $(CFLAGS_MODULE) \
-c -o $@ $<
$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
$(call if_changed,cc_o_c)
$(call if_changed_dep,cc_o_c)
targets += $(modules:.ko=.mod.o)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment