Add ppc32 fix fwd from akpm

diff --git a/queue/ppc32-re-add-embed_configc-to-ml300-ep405.patch b/queue/ppc32-re-add-embed_configc-to-ml300-ep405.patch
new file mode 100644 (file)
index 0000000..a413393
--- /dev/null
+++ b/queue/ppc32-re-add-embed_configc-to-ml300-ep405.patch
@@ -0,0 +1,35 @@
+From stable-bounces@linux.kernel.org  Fri Jan  6 00:16:31 2006
+Message-Id: <200601060811.k068BpV5011733@shell0.pdx.osdl.net>
+To: torvalds@osdl.org
+From: akpm@osdl.org
+Date: Fri, 06 Jan 2006 00:11:39 -0800
+Cc: jacmet@sunsite.dk, stable@kernel.org
+Subject: ppc32: Re-add embed_config.c to ml300/ep405
+
+From: Peter Korsgaard <jacmet@sunsite.dk>
+
+Commit 3e9e7c1d0b7a36fb8affb973a054c5098e27baa8 (ppc32: cleanup AMCC PPC40x
+eval boards to support U-Boot) broke the kernel for ML300 / EP405.
+
+It still compiles as there's a weak definition of the function in
+misc-embedded.c, but the kernel crashes as the bd_t fixup isn't performed.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ arch/ppc/boot/simple/Makefile |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- linux-2.6.15.y.orig/arch/ppc/boot/simple/Makefile
++++ linux-2.6.15.y/arch/ppc/boot/simple/Makefile
+@@ -190,6 +190,8 @@ boot-$(CONFIG_REDWOOD_5)   += embed_config
+ boot-$(CONFIG_REDWOOD_6)      += embed_config.o
+ boot-$(CONFIG_8xx)            += embed_config.o
+ boot-$(CONFIG_8260)           += embed_config.o
++boot-$(CONFIG_EP405)          += embed_config.o
++boot-$(CONFIG_XILINX_ML300)   += embed_config.o
+ boot-$(CONFIG_BSEIP)          += iic.o
+ boot-$(CONFIG_MBX)            += iic.o pci.o qspan_pci.o
+ boot-$(CONFIG_MV64X60)                += misc-mv64x60.o

diff --git a/queue/series b/queue/series
index ce841023c5fc095eb1340a02f1a05cb33c40c6f0..7fc1377c018d8d784c15e8ac426f78673004ea32 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -2,3 +2,4 @@ bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch
 ufs-inode-i_sem-is-not-released-in-error-path.patch
 skge-handle-out-of-memory-on-ring-changes.patch
 fix-ATY-video-on-sunblade.patch
+ppc32-re-add-embed_configc-to-ml300-ep405.patch