2 files changed, 11 insertions, 1 deletions

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)
         }