diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 01:45:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 01:45:43 -0500 |
commit | 5cbb3d216e2041700231bcfc383ee5f8b7fc8b74 (patch) | |
tree | a738fa82dbcefa9bd283c08bc67f38827be63937 /scripts/mod/modpost.c | |
parent | 9bc9ccd7db1c9f043f75380b5a5b94912046a60e (diff) | |
parent | 4e9b45a19241354daec281d7a785739829b52359 (diff) |
Merge branch 'akpm' (patches from Andrew Morton)
Merge first patch-bomb from Andrew Morton:
"Quite a lot of other stuff is banked up awaiting further
next->mainline merging, but this batch contains:
- Lots of random misc patches
- OCFS2
- Most of MM
- backlight updates
- lib/ updates
- printk updates
- checkpatch updates
- epoll tweaking
- rtc updates
- hfs
- hfsplus
- documentation
- procfs
- update gcov to gcc-4.7 format
- IPC"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (269 commits)
ipc, msg: fix message length check for negative values
ipc/util.c: remove unnecessary work pending test
devpts: plug the memory leak in kill_sb
./Makefile: export initial ramdisk compression config option
init/Kconfig: add option to disable kernel compression
drivers: w1: make w1_slave::flags long to avoid memory corruption
drivers/w1/masters/ds1wm.cuse dev_get_platdata()
drivers/memstick/core/ms_block.c: fix unreachable state in h_msb_read_page()
drivers/memstick/core/mspro_block.c: fix attributes array allocation
drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
kernel/panic.c: reduce 1 byte usage for print tainted buffer
gcov: reuse kbasename helper
kernel/gcov/fs.c: use pr_warn()
kernel/module.c: use pr_foo()
gcov: compile specific gcov implementation based on gcc version
gcov: add support for gcc 4.7 gcov format
gcov: move gcov structs definitions to a gcc version specific file
kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()
kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()
kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
...
Diffstat (limited to 'scripts/mod/modpost.c')
-rw-r--r-- | scripts/mod/modpost.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 8247979e8f64..bfcea5d3b27d 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -599,18 +599,17 @@ static void handle_modversions(struct module *mod, struct elf_info *info, | |||
599 | else | 599 | else |
600 | export = export_from_sec(info, get_secindex(info, sym)); | 600 | export = export_from_sec(info, get_secindex(info, sym)); |
601 | 601 | ||
602 | /* CRC'd symbol */ | ||
603 | if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) { | ||
604 | crc = (unsigned int) sym->st_value; | ||
605 | sym_update_crc(symname + strlen(CRC_PFX), mod, crc, | ||
606 | export); | ||
607 | } | ||
608 | |||
602 | switch (sym->st_shndx) { | 609 | switch (sym->st_shndx) { |
603 | case SHN_COMMON: | 610 | case SHN_COMMON: |
604 | warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name); | 611 | warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name); |
605 | break; | 612 | break; |
606 | case SHN_ABS: | ||
607 | /* CRC'd symbol */ | ||
608 | if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) { | ||
609 | crc = (unsigned int) sym->st_value; | ||
610 | sym_update_crc(symname + strlen(CRC_PFX), mod, crc, | ||
611 | export); | ||
612 | } | ||
613 | break; | ||
614 | case SHN_UNDEF: | 613 | case SHN_UNDEF: |
615 | /* undefined symbol */ | 614 | /* undefined symbol */ |
616 | if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL && | 615 | if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL && |