3.4-stable patches

added patches:
	powerpc-fix-typo-config_pmac.patch
	powerpc-fix-typo-config_ppc_cpu.patch
	powerpc-pseries-fix-overwritten-pe-state.patch

diff --git a/queue-3.4/powerpc-fix-typo-config_pmac.patch b/queue-3.4/powerpc-fix-typo-config_pmac.patch
new file mode 100644 (file)
index 0000000..45a74f6
--- /dev/null
+++ b/queue-3.4/powerpc-fix-typo-config_pmac.patch
@@ -0,0 +1,33 @@
+From 6e0fdf9af216887e0032c19d276889aad41cad00 Mon Sep 17 00:00:00 2001
+From: Paul Bolle <pebolle@tiscali.nl>
+Date: Tue, 20 May 2014 22:24:58 +0200
+Subject: powerpc: fix typo 'CONFIG_PMAC'
+
+From: Paul Bolle <pebolle@tiscali.nl>
+
+commit 6e0fdf9af216887e0032c19d276889aad41cad00 upstream.
+
+Commit b0d278b7d3ae ("powerpc/perf_event: Reduce latency of calling
+perf_event_do_pending") added a check for CONFIG_PMAC were a check for
+CONFIG_PPC_PMAC was clearly intended.
+
+Fixes: b0d278b7d3ae ("powerpc/perf_event: Reduce latency of calling perf_event_do_pending")
+Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kernel/time.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/kernel/time.c
++++ b/arch/powerpc/kernel/time.c
+@@ -496,7 +496,7 @@ void timer_interrupt(struct pt_regs * re
+ 
+       __get_cpu_var(irq_stat).timer_irqs++;
+ 
+-#if defined(CONFIG_PPC32) && defined(CONFIG_PMAC)
++#if defined(CONFIG_PPC32) && defined(CONFIG_PPC_PMAC)
+       if (atomic_read(&ppc_n_lost_interrupts) != 0)
+               do_IRQ(regs);
+ #endif

diff --git a/queue-3.4/powerpc-fix-typo-config_ppc_cpu.patch b/queue-3.4/powerpc-fix-typo-config_ppc_cpu.patch
new file mode 100644 (file)
index 0000000..2cca270
--- /dev/null
+++ b/queue-3.4/powerpc-fix-typo-config_ppc_cpu.patch
@@ -0,0 +1,32 @@
+From b69a1da94f3d1589d1942b5d1b384d8cfaac4500 Mon Sep 17 00:00:00 2001
+From: Paul Bolle <pebolle@tiscali.nl>
+Date: Tue, 20 May 2014 21:59:42 +0200
+Subject: powerpc: fix typo 'CONFIG_PPC_CPU'
+
+From: Paul Bolle <pebolle@tiscali.nl>
+
+commit b69a1da94f3d1589d1942b5d1b384d8cfaac4500 upstream.
+
+Commit cd64d1697cf0 ("powerpc: mtmsrd not defined") added a check for
+CONFIG_PPC_CPU were a check for CONFIG_PPC_FPU was clearly intended.
+
+Fixes: cd64d1697cf0 ("powerpc: mtmsrd not defined")
+Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/lib/sstep.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/lib/sstep.c
++++ b/arch/powerpc/lib/sstep.c
+@@ -1395,7 +1395,7 @@ int __kprobes emulate_step(struct pt_reg
+                               regs->gpr[rd] = byterev_4(val);
+                       goto ldst_done;
+ 
+-#ifdef CONFIG_PPC_CPU
++#ifdef CONFIG_PPC_FPU
+               case 535:       /* lfsx */
+               case 567:       /* lfsux */
+                       if (!(regs->msr & MSR_FP))

diff --git a/queue-3.4/powerpc-pseries-fix-overwritten-pe-state.patch b/queue-3.4/powerpc-pseries-fix-overwritten-pe-state.patch
new file mode 100644 (file)
index 0000000..74afe9b
--- /dev/null
+++ b/queue-3.4/powerpc-pseries-fix-overwritten-pe-state.patch
@@ -0,0 +1,32 @@
+From 54f112a3837d4e7532bbedbbbf27c0de277be510 Mon Sep 17 00:00:00 2001
+From: Gavin Shan <gwshan@linux.vnet.ibm.com>
+Date: Thu, 24 Apr 2014 18:00:21 +1000
+Subject: powerpc/pseries: Fix overwritten PE state
+
+From: Gavin Shan <gwshan@linux.vnet.ibm.com>
+
+commit 54f112a3837d4e7532bbedbbbf27c0de277be510 upstream.
+
+In pseries_eeh_get_state(), EEH_STATE_UNAVAILABLE is always
+overwritten by EEH_STATE_NOT_SUPPORT because of the missed
+"break" there. The patch fixes the issue.
+
+Reported-by: Joe Perches <joe@perches.com>
+Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/platforms/pseries/eeh_pseries.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
++++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
+@@ -319,6 +319,7 @@ static int pseries_eeh_get_state(struct
+                       } else {
+                               result = EEH_STATE_NOT_SUPPORT;
+                       }
++                      break;
+               default:
+                       result = EEH_STATE_NOT_SUPPORT;
+               }

diff --git a/queue-3.4/series b/queue-3.4/series
index 2bf9c4ee593a5e2ddbdcab837a1116b7614a4d8d..b3f2bd0ebe72ad331d982ec7577056f85f9b3a41 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -12,3 +12,6 @@ ib-umad-fix-error-handling.patch
 ib-umad-fix-use-after-free-on-close.patch
 nfsd4-fix-free_stateid-lockowner-leak.patch
 nfsd-getattr-for-fattr4_word0_files_avail-needs-the-statfs-buffer.patch
+powerpc-pseries-fix-overwritten-pe-state.patch
+powerpc-fix-typo-config_pmac.patch
+powerpc-fix-typo-config_ppc_cpu.patch