diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-23 19:45:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-23 19:45:19 -0700 |
| commit | 4d634ca35a8b38530b134ae92bc9e3cc9c23c030 (patch) | |
| tree | a200b0cf656bf4c61bfbcb2e22bb5f9a23b43ce8 | |
| parent | d2da626d6cb5df2c5d4222168c91ddf765aa4354 (diff) | |
| parent | e88aa7bbbe3046a125ea1936b16bb921cc9c6349 (diff) | |
| download | op-kernel-dev-4d634ca35a8b38530b134ae92bc9e3cc9c23c030.zip op-kernel-dev-4d634ca35a8b38530b134ae92bc9e3cc9c23c030.tar.gz | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull build system failure fix from Michal Marek:
"This fixes build failure with newer gcc that adds some internal
symbols that end in "__mod_*_device_table", but are not actually the
tables themselves."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
Fix modpost failures in fedora 17
| -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 8e730cc..44ddaa5 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) |
