aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-14 21:53:07 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-14 21:53:07 -0400
commit22b1a9203ea634ac0ee5240e021613da3328275f (patch)
treeb7c5d24e6ee55e59677c3d8d483c0d1f3111a76c
parent21c562e39c5927ce8408f5ec8680f98e9df1e9e3 (diff)
parent2648a53acf16a837e11836203aadb219bd951a1e (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix: kbuild: fix sh64 section mismatch problems
-rw-r--r--scripts/mod/modpost.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8e5610d428c5..3645e980da71 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1052,6 +1052,7 @@ static int init_section_ref_ok(const char *name)
1052 ".plt", /* seen on ARCH=um build on x86_64. Harmless */ 1052 ".plt", /* seen on ARCH=um build on x86_64. Harmless */
1053 "__ftr_fixup", /* powerpc cpu feature fixup */ 1053 "__ftr_fixup", /* powerpc cpu feature fixup */
1054 "__fw_ftr_fixup", /* powerpc firmware feature fixup */ 1054 "__fw_ftr_fixup", /* powerpc firmware feature fixup */
1055 ".cranges", /* used by sh64 */
1055 NULL 1056 NULL
1056 }; 1057 };
1057 /* Start of section names */ 1058 /* Start of section names */
@@ -1132,6 +1133,7 @@ static int exit_section_ref_ok(const char *name)
1132 ".fixup", 1133 ".fixup",
1133 ".smp_locks", 1134 ".smp_locks",
1134 ".plt", /* seen on ARCH=um build on x86_64. Harmless */ 1135 ".plt", /* seen on ARCH=um build on x86_64. Harmless */
1136 ".cranges", /* used by sh64 */
1135 NULL 1137 NULL
1136 }; 1138 };
1137 /* Start of section names */ 1139 /* Start of section names */