From b1b85869240e765c25d6f13f3ede535e60889df3 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 15 Apr 2017 02:41:22 +0100 Subject: [PATCH] [powerpc/powerpc64,ppc64] Set NR_CPUS=2048, matching ppc64el --- debian/changelog | 1 + debian/config/kernelarch-powerpc/config-arch-64 | 1 + debian/config/kernelarch-powerpc/config-arch-64-be | 5 ----- debian/config/kernelarch-powerpc/config-arch-64-le | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08df9e185..df7b312b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium * cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores (Closes: #859978) * udeb: Include all AHCI drivers in sata-modules (Closes: #860335) + * [powerpc/powerpc64,ppc64] Set NR_CPUS=2048, matching ppc64el [ Salvatore Bonaccorso ] * ping: implement proper locking (CVE-2017-2671) diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64 index 1adb2a621..c89c34197 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64 +++ b/debian/config/kernelarch-powerpc/config-arch-64 @@ -33,6 +33,7 @@ CONFIG_PPC64=y CONFIG_ALTIVEC=y CONFIG_VSX=y CONFIG_SMP=y +CONFIG_NR_CPUS=2048 ## ## file: arch/powerpc/platforms/powernv/Kconfig diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be index c4f693a81..bfd4d909e 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-be +++ b/debian/config/kernelarch-powerpc/config-arch-64-be @@ -16,11 +16,6 @@ CONFIG_SPU_FS=m CONFIG_CBE_RAS=y CONFIG_CBE_THERM=m -## -## file: arch/powerpc/platforms/Kconfig.cputype -## -CONFIG_NR_CPUS=32 - ## ## file: arch/powerpc/platforms/maple/Kconfig ## diff --git a/debian/config/kernelarch-powerpc/config-arch-64-le b/debian/config/kernelarch-powerpc/config-arch-64-le index 4467c3059..f0ad2b371 100644 --- a/debian/config/kernelarch-powerpc/config-arch-64-le +++ b/debian/config/kernelarch-powerpc/config-arch-64-le @@ -6,7 +6,6 @@ ## ## file: arch/powerpc/platforms/Kconfig.cputype ## -CONFIG_NR_CPUS=2048 ## choice: Endianness selection # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y