[linux] 03/05: [mips*/octeon] Set NR_CPUS=64 to allow for Cavium CN7890

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 01f0df794debdc9dd17b60165dce49ade2537839
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Apr 16 17:07:56 2017 +0100

    [mips*/octeon] Set NR_CPUS=64 to allow for Cavium CN7890
    
    The CN7890 has 48 Octeon III cores.
    
    I don't know whether current configuration will run on a CN7890, but this
    should avoid an ABI break if we add support later.
---
 debian/changelog                            | 1 +
 debian/config/kernelarch-mips/config.octeon | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8d103f1..1c61787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [powerpc/powerpc64,ppc64] Set NR_CPUS=2048, matching ppc64el
   * [powerpc*/*64*] Enable CPUMASK_OFFSTACK to reduce stack usage
   * [mips*el/loongson-3] Set NR_CPUS=16 to allow for Loongson 3B2000
+  * [mips*/octeon] Set NR_CPUS=64 to allow for Cavium CN7890
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon
index e6ab4ee..8b1c35a 100644
--- a/debian/config/kernelarch-mips/config.octeon
+++ b/debian/config/kernelarch-mips/config.octeon
@@ -10,7 +10,7 @@ CONFIG_64BIT=y
 ## end choice
 CONFIG_SMP=y
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=64
 
 ##
 ## file: arch/mips/cavium-octeon/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git