Patch "MIPS: CM: Fix mips_cm_max_vp_width for UP kernels" has been added to the 4.6-stable tree

Patch "MIPS: CM: Fix mips_cm_max_vp_width for UP kernels" has been added to the 4.6-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    MIPS: CM: Fix mips_cm_max_vp_width for UP kernels

to the 4.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>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;
 }
 
 /**


Patches currently in stable-queue which might be from paul.burton@imgtec.com are

queue-4.6/mips-cm-fix-mips_cm_max_vp_width-for-up-kernels.patch
queue-4.6/irqchip-mips-gic-match-ipi-irq-domain-by-bus-token-only.patch
queue-4.6/irqchip-mips-gic-map-to-vps-using-hw-vpnum.patch