diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-08 20:15:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-08 20:15:55 -0400 |
| commit | 331c5841ddbb4cf3034ffc425a70f42acc5cdaff (patch) | |
| tree | 760d9e605c904a34aae64dad2c0b4f427c2bf64c /scripts | |
| parent | 9d993ccb004f93b745d1557ab034928d995dad59 (diff) | |
| parent | 673c2c34f684e9d4328459e426ab54d51a5865c5 (diff) | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile fix from Chris Metcalf:
"This fix eliminates a "section mismatch" warning caused by the new
__ex_table checking code in modpost"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
modpost: work correctly with tile coldtext sections
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 91ee1b2e0f9a..12d3db3bd46b 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -886,7 +886,8 @@ static void check_section(const char *modname, struct elf_info *elf, | |||
| 886 | #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ | 886 | #define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ |
| 887 | ".kprobes.text" | 887 | ".kprobes.text" |
| 888 | #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ | 888 | #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ |
| 889 | ".fixup", ".entry.text", ".exception.text", ".text.*" | 889 | ".fixup", ".entry.text", ".exception.text", ".text.*", \ |
| 890 | ".coldtext" | ||
| 890 | 891 | ||
| 891 | #define INIT_SECTIONS ".init.*" | 892 | #define INIT_SECTIONS ".init.*" |
| 892 | #define MEM_INIT_SECTIONS ".meminit.*" | 893 | #define MEM_INIT_SECTIONS ".meminit.*" |