Subject: Two 32bit power3/4 build-failure patches ...

From: Sven Luther <[email-masked]>
Date: Sun, 16 Oct 2005 12:28:28 +0200

Hello,

I have here two 32bit power[34] build failure patches that the debian kernels
has been using for some time, and which i think i did post here in the past,
but it doesn't seem to be applied.

Well, those are 32 bit issues, and debian doesn't build anymore 32bit kernels
of those flavours, but i guess it may be possible that some random user wants
to build them, so it would be nice if they could be included upstream.

Friendly,

Sven Luther

#! /bin/sh -e 
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: Works around a broken build system, namely the
## DP: Description: simple bootloader on power 3/4.
## DP: Misc: Pulled from the ubuntu tree.
## DP: Patch author: [email-masked]
## DP: Upstream status: FTBFS fix, guess it will be fixed upstream too

. $(dirname $0)/DPATCH

@DPATCH@
diff -urNad linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c
--- linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-24 22:33:51.000000000 +0100
+++ /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-28 10:43:29.838010536 +0100
@@ -152,9 +152,11 @@
 		hold_residual->VitalProductData.Reserved5 = 0xdeadbeef;
 	}
 
+#if defined(CONFIG_6xx)
 	/* Now go and clear out the BATs and ensure that our MSR is
 	 * correct .*/
 	disable_6xx_mmu();
+#endif
 
 	/* Make r3 be a pointer to the residual data. */
 	return (unsigned long)hold_residual;
#! /bin/sh -e
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: [PATCH] ppc32: fixes FTBFS on power3/4.
## DP: This patch doesn't build pmac_cache.S on power3/power4, since it is
## DP: broken there and not needed.
## DP: Patch author: Sven Luther <[email-masked]>
## DP: Upstream status: FTBFS, submitted to linuxppc-dev and benh.

. $(dirname $0)/DPATCH

@DPATCH@
--- kernel-source-2.6.11/arch/ppc/platforms/Makefile.orig	2005-03-27 11:38:25.000000000 +0200
+++ kernel-source-2.6.11/arch/ppc/platforms/Makefile	2005-03-27 11:39:23.000000000 +0200
@@ -9,9 +9,15 @@
 ifeq ($(CONFIG_APUS),y)
 obj-$(CONFIG_PCI)		+= apus_pci.o
 endif
+ifeq ($(CONFIG_6xx),y)
 obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
 					pmac_feature.o pmac_pci.o pmac_sleep.o \
 					pmac_low_i2c.o pmac_cache.o
+else
+obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
+					pmac_feature.o pmac_pci.o pmac_sleep.o \
+					pmac_low_i2c.o
+endif
 obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
 					chrp_pegasos_eth.o
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o