4.6-stable patches

added patches:
	mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch

diff --git a/queue-4.6/mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch b/queue-4.6/mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch
new file mode 100644 (file)
index 0000000..7c2c302
--- /dev/null
+++ b/queue-4.6/mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch
@@ -0,0 +1,47 @@
+From a60ae81e5e5918138703f22427dd8f2445985b55 Mon Sep 17 00:00:00 2001
+From: Paul Burton <paul.burton@imgtec.com>
+Date: Wed, 3 Feb 2016 03:15:26 +0000
+Subject: MIPS: CM: Fix mips_cm_max_vp_width for UP kernels
+
+From: Paul Burton <paul.burton@imgtec.com>
+
+commit a60ae81e5e5918138703f22427dd8f2445985b55 upstream.
+
+Fix mips_cm_max_vp_width for UP kernels where it previously referenced
+smp_num_siblings, which is not declared for UP kernels. This led to
+build errors such as the following:
+
+  drivers/built-in.o: In function `$L446':
+  irq-mips-gic.c:(.text+0x1994): undefined reference to `smp_num_siblings'
+  drivers/built-in.o:irq-mips-gic.c:(.text+0x199c): more undefined references to `smp_num_siblings' follow
+
+On UP kernels simply return 1, leaving the reference to smp_num_siblings
+in place only for SMP kernels.
+
+Signed-off-by: Paul Burton <paul.burton@imgtec.com>
+Cc: Matt Redfearn <matt.redfearn@imgtec.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: linux-mips@linux-mips.org
+Cc: linux-kernel@vger.kernel.org
+Patchwork: https://patchwork.linux-mips.org/patch/12332/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/mips-cm.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/mips-cm.h
++++ b/arch/mips/include/asm/mips-cm.h
+@@ -461,7 +461,10 @@ static inline unsigned int mips_cm_max_v
+       if (mips_cm_revision() >= CM_REV_CM3)
+               return read_gcr_sys_config2() & CM_GCR_SYS_CONFIG2_MAXVPW_MSK;
+ 
+-      return smp_num_siblings;
++      if (config_enabled(CONFIG_SMP))
++              return smp_num_siblings;
++
++      return 1;
+ }
+ 
+ /**

diff --git a/queue-4.6/series b/queue-4.6/series
index d64b03985a6212b94c36ec0329780390c6165682..aa2b2a1a760548679d9c40956cd0a332fcd55c1d 100644 (file)
--- a/queue-4.6/series
+++ b/queue-4.6/series
@@ -94,3 +94,4 @@ intel_th-pci-add-kaby-lake-pch-h-support.patch
 intel_th-fix-a-deadlock-in-modprobing.patch
 vfs-ioctl-prevent-double-fetch-in-dedupe-ioctl.patch
 vfs-fix-deadlock-in-file_remove_privs-on-overlayfs.patch
+mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch