diff options
| author | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:08 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2013-11-22 18:57:54 -0500 |
| commit | fc582aef7dcc27a7120cf232c1e76c569c7b6eab (patch) | |
| tree | 7d275dd4ceab6067b91e9a25a5f6338b425fbccd /scripts/mod/modpost.c | |
| parent | 9175c9d2aed528800175ef81c90569d00d23f9be (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 62164348ecf7..8247979e8f64 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -821,6 +821,7 @@ static const char *section_white_list[] = | |||
| 821 | { | 821 | { |
| 822 | ".comment*", | 822 | ".comment*", |
| 823 | ".debug*", | 823 | ".debug*", |
| 824 | ".cranges", /* sh64 */ | ||
| 824 | ".zdebug*", /* Compressed debug sections. */ | 825 | ".zdebug*", /* Compressed debug sections. */ |
| 825 | ".GCC-command-line", /* mn10300 */ | 826 | ".GCC-command-line", /* mn10300 */ |
| 826 | ".GCC.command.line", /* record-gcc-switches, non mn10300 */ | 827 | ".GCC.command.line", /* record-gcc-switches, non mn10300 */ |