From: Greg Kroah-Hartman Date: Tue, 24 Aug 2010 18:34:55 +0000 (-0700) Subject: .32 patches X-Git-Tag: v2.6.32.21~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c02dd2ad64de19b1dbd4e9a4f18e04abbf35a89;p=thirdparty%2Fkernel%2Fstable-queue.git .32 patches --- diff --git a/queue-2.6.32/powerpc-fix-typo-in-uimage-target.patch b/queue-2.6.32/powerpc-fix-typo-in-uimage-target.patch new file mode 100644 index 00000000000..b05bc01956a --- /dev/null +++ b/queue-2.6.32/powerpc-fix-typo-in-uimage-target.patch @@ -0,0 +1,34 @@ +From c686ecf5040d287a68d4fca7f1948472f556a6d3 Mon Sep 17 00:00:00 2001 +From: Anatolij Gustschin +Date: Sun, 15 Aug 2010 22:26:56 +0000 +Subject: powerpc: Fix typo in uImage target + +From: Anatolij Gustschin + +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 +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + 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.32/powerpc-initialise-paca-kstack-before-early_setup_secondary.patch b/queue-2.6.32/powerpc-initialise-paca-kstack-before-early_setup_secondary.patch new file mode 100644 index 00000000000..1331a260cfe --- /dev/null +++ b/queue-2.6.32/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 +Date: Thu, 12 Aug 2010 20:58:28 +0000 +Subject: powerpc: Initialise paca->kstack before early_setup_secondary + +From: Matt Evans + +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 +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -563,9 +563,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#] */ +@@ -573,6 +570,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.32/series b/queue-2.6.32/series index 6777347a4ed..312df200e38 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -45,3 +45,5 @@ alsa-intel8x0-mute-external-amplifier-by-default-for-thinkpad-x31.patch netlink-fix-compat-recvmsg.patch drm-radeon-kms-fix-typo-in-radeon_compute_pll_gain.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