From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 26 Jul 2013 00:04:46 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.0.88~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54a952a23ff354159f06e42b68076ec9e0daf2b1;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	mips-oceton-fix-build-error.patch
	rapidio-idt_gen2-fix-build-error.patch
---

diff --git a/queue-3.10/mips-oceton-fix-build-error.patch b/queue-3.10/mips-oceton-fix-build-error.patch
new file mode 100644
index 00000000000..516144df888
--- /dev/null
+++ b/queue-3.10/mips-oceton-fix-build-error.patch
@@ -0,0 +1,42 @@
+From 39205750efa6d335fac4f9bcd32b49c7e71c12b7 Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Thu, 13 Jun 2013 01:29:24 +0200
+Subject: MIPS: Oceton: Fix build error.
+
+From: Ralf Baechle <ralf@linux-mips.org>
+
+commit 39205750efa6d335fac4f9bcd32b49c7e71c12b7 upstream.
+
+If CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB, CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION,
+CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT and
+CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT are all undefined:
+
+arch/mips/cavium-octeon/setup.c: In function ‘prom_init’:
+arch/mips/cavium-octeon/setup.c:715:12: error: unused variable ‘ebase’ [-Werror=unused-variable]
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/cavium-octeon/setup.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -7,6 +7,7 @@
+  * Copyright (C) 2008, 2009 Wind River Systems
+  *   written by Ralf Baechle <ralf@linux-mips.org>
+  */
++#include <linux/compiler.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/console.h>
+@@ -712,7 +713,7 @@ void __init prom_init(void)
+ 	if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) {
+ 		pr_info("Skipping L2 locking due to reduced L2 cache size\n");
+ 	} else {
+-		uint32_t ebase = read_c0_ebase() & 0x3ffff000;
++		uint32_t __maybe_unused ebase = read_c0_ebase() & 0x3ffff000;
+ #ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB
+ 		/* TLB refill */
+ 		cvmx_l2c_lock_mem_region(ebase, 0x100);
diff --git a/queue-3.10/rapidio-idt_gen2-fix-build-error.patch b/queue-3.10/rapidio-idt_gen2-fix-build-error.patch
new file mode 100644
index 00000000000..0bfbac8174b
--- /dev/null
+++ b/queue-3.10/rapidio-idt_gen2-fix-build-error.patch
@@ -0,0 +1,33 @@
+From 27f62b9f294b7e2019c94c385abda43a0af6bb8b Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Thu, 13 Jun 2013 02:45:53 +0200
+Subject: RAPIDIO: IDT_GEN2: Fix build error.
+
+From: Ralf Baechle <ralf@linux-mips.org>
+
+commit 27f62b9f294b7e2019c94c385abda43a0af6bb8b upstream.
+
+  CC      drivers/rapidio/switches/idt_gen2.o
+drivers/rapidio/switches/idt_gen2.c: In function ‘idtg2_show_errlog’:
+drivers/rapidio/switches/idt_gen2.c:379:30: error: ‘PAGE_SIZE’ undeclared (first use in this function)
+drivers/rapidio/switches/idt_gen2.c:379:30: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/rapidio/switches/idt_gen2.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/rapidio/switches/idt_gen2.c
++++ b/drivers/rapidio/switches/idt_gen2.c
+@@ -15,6 +15,8 @@
+ #include <linux/rio_drv.h>
+ #include <linux/rio_ids.h>
+ #include <linux/delay.h>
++
++#include <asm/page.h>
+ #include "../rio.h"
+ 
+ #define LOCAL_RTE_CONF_DESTID_SEL	0x010070
diff --git a/queue-3.10/series b/queue-3.10/series
index 708bcf6aac0..148e28737b1 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -40,3 +40,5 @@ tuntap-do-not-zerocopy-if-iov-needs-more-pages-than-max_skb_frags.patch
 macvtap-do-not-zerocopy-if-iov-needs-more-pages-than-max_skb_frags.patch
 vlan-mask-vlan-prio-bits.patch
 vlan-fix-a-race-in-egress-prio-management.patch
+mips-oceton-fix-build-error.patch
+rapidio-idt_gen2-fix-build-error.patch