Merge ../linus

1 files changed, 4 insertions, 0 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 41277963f47a..ac0a58222992 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -911,6 +911,7 @@ static int init_section_ref_ok(const char *name)
                 ".toc1",  /* used by ppc64 */
                 ".stab",
                 ".rodata",
+                ".parainstructions",
                 ".text.lock",
                 "__bug_table", /* used by powerpc for BUG() */
                 ".pci_fixup_header",
@@ -921,6 +922,8 @@ static int init_section_ref_ok(const char *name)
                 ".fixup",
                 ".smp_locks",
                 ".plt",  /* seen on ARCH=um build on x86_64. Harmless */
+                "__ftr_fixup",          /* powerpc cpu feature fixup */
+                "__fw_ftr_fixup",       /* powerpc firmware feature fixup */
                 NULL
         };
         /* Start of section names */
@@ -929,6 +932,7 @@ static int init_section_ref_ok(const char *name)
                 ".altinstructions",
                 ".eh_frame",
                 ".debug",
+                ".parainstructions",
                 NULL
         };
         /* part of section name */