6 files changed, 16 insertions, 5 deletions

diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S
index 4b348b38cf33..9859d49d088b 100644
--- a/arch/cris/arch-v10/vmlinux.lds.S
+++ b/arch/cris/arch-v10/vmlinux.lds.S
@@ -44,7 +44,7 @@ SECTIONS
         ___data_start = . ;
         __Sdata = . ;
         .data : {                     /* Data */
-                *(.data)
+                DATA_DATA
         }
         __edata = . ;                 /* End of data section */
         _edata = . ;
diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S
index 651a77f2ccc4..b076c134c0bb 100644
--- a/arch/cris/arch-v32/vmlinux.lds.S
+++ b/arch/cris/arch-v32/vmlinux.lds.S
@@ -49,7 +49,7 @@ SECTIONS
         ___data_start = . ;
         __Sdata = . ;
         .data : {                     /* Data */
-                *(.data)
+                DATA_DATA
         }
         __edata = . ;           /* End of data section. */
         _edata = . ;
diff --git a/arch/i386/mach-generic/es7000.c b/arch/i386/mach-generic/es7000.c
index b47f951c0ec2..4742626f08c4 100644
--- a/arch/i386/mach-generic/es7000.c
+++ b/arch/i386/mach-generic/es7000.c
@@ -66,4 +66,4 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 }
 #endif
 
-struct genapic apic_es7000 = APIC_INIT("es7000", probe_es7000);
+struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000);
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 187a39af3e1c..6c1e36c33faa 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -201,6 +201,14 @@ checkbin:
                         false; \
                 fi ; \
         fi
+        @if test "$(call cc-fullversion)" = "040200" \
+            && test "x${CONFIG_MODULES}${CONFIG_PPC64}" = "xyy" ; then \
+                echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \
+                echo 'kernel with modules enabled.' ; \
+                echo -n '*** Please use a different GCC version or ' ; \
+                echo 'disable kernel modules' ; \
+                false ; \
+        fi
         @if ! /bin/echo dssall | $(AS) -many -o $(TOUT) >/dev/null 2>&1 ; then \
                 echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build ' ; \
                 echo 'correctly with old versions of binutils.' ; \
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 7a1f5a0964de..0c458556399f 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -177,7 +177,9 @@ SECTIONS
         }
 #else
         .data : {
-                *(.data .data.rel* .toc1)
+                DATA_DATA
+                *(.data.rel*)
+                *(.toc1)
                 *(.branch_lt)
         }
 
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index 3e31512109f9..ac4ed52034db 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -118,7 +118,8 @@ SECTIONS
   _fdata = .;
   .data :
   {
-    *(.data) CONSTRUCTORS
+    DATA_DATA
+    CONSTRUCTORS
     . = ALIGN(XCHAL_ICACHE_LINESIZE);
     *(.data.cacheline_aligned)
   }