From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932379AbbEHNaV (ORCPT ); Fri, 8 May 2015 09:30:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48635 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932328AbbEHNaP (ORCPT ); Fri, 8 May 2015 09:30:15 -0400 Date: Fri, 8 May 2015 06:29:45 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, akpm@linux-foundation.org, peterz@infradead.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com, hpa@zytor.com, torvalds@linux-foundation.org, akpm@linux-foundation.org, mingo@kernel.org, peterz@infradead.org In-Reply-To: <1431080726-2490-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1431080726-2490-1-git-send-email-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/build] x86/kconfig: Fix the CONFIG_NR_CPUS description Git-Commit-ID: cad14bb9f8ef8bed42c3118adc0d9756e2aeeaa1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cad14bb9f8ef8bed42c3118adc0d9756e2aeeaa1 Gitweb: http://git.kernel.org/tip/cad14bb9f8ef8bed42c3118adc0d9756e2aeeaa1 Author: Kirill A. Shutemov AuthorDate: Fri, 8 May 2015 13:25:26 +0300 Committer: Ingo Molnar CommitDate: Fri, 8 May 2015 12:58:56 +0200 x86/kconfig: Fix the CONFIG_NR_CPUS description Since: b53b5eda8194 ("x86/cpu: Increase max CPU count to 8192") ... the maximum supported NR_CPUS for CPUMASK_OFFSTACK case is 8192. Let's adjust the description to reflect the change. Signed-off-by: Kirill A. Shutemov Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1431080726-2490-1-git-send-email-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 83cd1c7..c3333e5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -856,7 +856,7 @@ config NR_CPUS ---help--- This allows you to specify the maximum number of CPUs which this kernel will support. If CPUMASK_OFFSTACK is enabled, the maximum - supported value is 4096, otherwise the maximum value is 512. The + supported value is 8192, otherwise the maximum value is 512. The minimum value which makes sense is 2. This is purely to save memory - each supported CPU adds