.34 patches

diff --git a/queue-2.6.34/powerpc-fix-typo-in-uimage-target.patch b/queue-2.6.34/powerpc-fix-typo-in-uimage-target.patch
new file mode 100644 (file)
index 0000000..b05bc01
--- /dev/null
+++ b/queue-2.6.34/powerpc-fix-typo-in-uimage-target.patch
@@ -0,0 +1,34 @@
+From c686ecf5040d287a68d4fca7f1948472f556a6d3 Mon Sep 17 00:00:00 2001
+From: Anatolij Gustschin <agust@denx.de>
+Date: Sun, 15 Aug 2010 22:26:56 +0000
+Subject: powerpc: Fix typo in uImage target
+
+From: Anatolij Gustschin <agust@denx.de>
+
+commit c686ecf5040d287a68d4fca7f1948472f556a6d3 upstream.
+
+Commit e32e78c5ee8aadef020fbaecbe6fb741ed9029fd
+(powerpc: fix build with make 3.82) introduced a
+typo in uImage target and broke building uImage:
+
+make: *** No rule to make target `uImage'.  Stop.
+
+Signed-off-by: Anatolij Gustschin <agust@denx.de>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -159,7 +159,7 @@ drivers-$(CONFIG_OPROFILE) += arch/power
+ all: zImage
+ 
+ # With make 3.82 we cannot mix normal and wildcard targets
+-BOOT_TARGETS1 := zImage zImage.initrd uImaged
++BOOT_TARGETS1 := zImage zImage.initrd uImage
+ BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
+ 
+ PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)

diff --git a/queue-2.6.34/powerpc-initialise-paca-kstack-before-early_setup_secondary.patch b/queue-2.6.34/powerpc-initialise-paca-kstack-before-early_setup_secondary.patch
new file mode 100644 (file)
index 0000000..135b25c
--- /dev/null
+++ b/queue-2.6.34/powerpc-initialise-paca-kstack-before-early_setup_secondary.patch
@@ -0,0 +1,51 @@
+From f761622e59433130bc33ad086ce219feee9eb961 Mon Sep 17 00:00:00 2001
+From: Matt Evans <matt@ozlabs.org>
+Date: Thu, 12 Aug 2010 20:58:28 +0000
+Subject: powerpc: Initialise paca->kstack before early_setup_secondary
+
+From: Matt Evans <matt@ozlabs.org>
+
+commit f761622e59433130bc33ad086ce219feee9eb961 upstream.
+
+As early setup calls down to slb_initialize(), we must have kstack
+initialised before checking "should we add a bolted SLB entry for our kstack?"
+
+Failing to do so means stack access requires an SLB miss exception to refill
+an entry dynamically, if the stack isn't accessible via SLB(0) (kernel text
+& static data).  It's not always allowable to take such a miss, and
+intermittent crashes will result.
+
+Primary CPUs don't have this issue; an SLB entry is not bolted for their
+stack anyway (as that lives within SLB(0)).  This patch therefore only
+affects the init of secondaries.
+
+Signed-off-by: Matt Evans <matt@ozlabs.org>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/kernel/head_64.S |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
+@@ -572,9 +572,6 @@ __secondary_start:
+       /* Set thread priority to MEDIUM */
+       HMT_MEDIUM
+ 
+-      /* Do early setup for that CPU (stab, slb, hash table pointer) */
+-      bl      .early_setup_secondary
+-
+       /* Initialize the kernel stack.  Just a repeat for iSeries.      */
+       LOAD_REG_ADDR(r3, current_set)
+       sldi    r28,r24,3               /* get current_set[cpu#]         */
+@@ -582,6 +579,9 @@ __secondary_start:
+       addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
+       std     r1,PACAKSAVE(r13)
+ 
++      /* Do early setup for that CPU (stab, slb, hash table pointer) */
++      bl      .early_setup_secondary
++
+       /* Clear backchain so we get nice backtraces */
+       li      r7,0
+       mtlr    r7

diff --git a/queue-2.6.34/series b/queue-2.6.34/series
index 63fbacdba24e6ccfcc64e3a3d86f86ea3ad760cd..25179d086d0fde5b34527dba767e82881c91aafe 100644 (file)
--- a/queue-2.6.34/series
+++ b/queue-2.6.34/series
@@ -76,3 +76,5 @@ drm-radeon-kms-dce3-switch-pads-to-ddc-mode-when-going-i2c.patch
 drm-radeon-kms-fix-sideport-detection-on-newer-rs880-boards.patch
 drm-radeon-kms-fix-gtt-vram-overlapping-test.patch
 drm-stop-information-leak-of-old-kernel-stack.patch
+powerpc-fix-typo-in-uimage-target.patch
+powerpc-initialise-paca-kstack-before-early_setup_secondary.patch