imported patch fix-section-mismatches

diff --git a/drivers/xen/core/smpboot.c b/drivers/xen/core/smpboot.c
index 5b31d1f4a96bb91d243f5a4041a7290d9e26f4d5..cd005f69356edb31adc6caab396d88dc5fa4ed17 100644 (file)
--- a/drivers/xen/core/smpboot.c
+++ b/drivers/xen/core/smpboot.c
@@ -378,7 +378,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 #endif
 }
 
-void __devinit smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
        prefill_possible_map();
 }

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1c9ad489b2c1689bb80eb38c8d5b0c4177a79eab..557ab1e9a5d2d164c879a8983bd1bee752b4e1e0 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -958,7 +958,9 @@ static int init_section_ref_ok(const char *name)
        /* Start of section names */
        const char *namelist2[] = {
                ".init.",
+               ".pci_fixup",
                ".altinstructions",
+               ".smp_alternatives",
                ".eh_frame",
                ".debug",
                NULL
@@ -1021,6 +1023,7 @@ static int exit_section_ref_ok(const char *name)
                ".opd", /* See comment [OPD] */
                ".toc1",  /* used by ppc64 */
                ".altinstructions",
+               ".smp_alternatives",
                ".pdr",
                "__bug_table", /* used by powerpc for BUG() */
                ".exitcall.exit",