diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-10 00:21:11 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-10 00:23:17 -0700 |
commit | caafc71b1a25096ef74904adb19d37e5c6a282dc (patch) | |
tree | 17f0602c6e04fdec78c50a1c2cbd70a0303ed2c6 /scripts/mod/file2alias.c | |
parent | af568679f51de779d0e9ad7d8360dc7727da546d (diff) | |
parent | bcd59b0f0c14b0584c1213ee3b53d5f84517c419 (diff) |
Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
DaVinci SoC updates for v3.5
This pull request updates the DaVinci SoC support to implement DEBUG_LL port
choice and optimizes the DMA ISR by removing unnecessary register reads.
* tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: optimize the DMA ISR
ARM: davinci: implement DEBUG_LL port choice
+ sync with Linux 3.4-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'scripts/mod/file2alias.c')
-rw-r--r-- | scripts/mod/file2alias.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 8e730ccc3f2..44ddaa542db 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -1100,6 +1100,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections) return; + /* We're looking for an object */ + if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT) + return; + /* All our symbols are of form <prefix>__mod_XXX_device_table. */ name = strstr(symname, "__mod_"); if (!name) |