diff --git a/debian/changelog b/debian/changelog
index 8d103f19d..1c61787de 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 e6ab4ee09..8b1c35aa4 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