From patchwork Thu Jan 21 06:28:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 74244 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0L6VEZv011745 for ; Thu, 21 Jan 2010 06:31:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754559Ab0AUGaw (ORCPT ); Thu, 21 Jan 2010 01:30:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754762Ab0AUGaa (ORCPT ); Thu, 21 Jan 2010 01:30:30 -0500 Received: from sca-es-mail-1.Sun.COM ([192.18.43.132]:36150 "EHLO sca-es-mail-1.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754695Ab0AUG33 (ORCPT ); Thu, 21 Jan 2010 01:29:29 -0500 Received: from fe-sfbay-09.sun.com ([192.18.43.129]) by sca-es-mail-1.sun.com (8.13.7+Sun/8.12.9) with ESMTP id o0L6TT6Z011860; Wed, 20 Jan 2010 22:29:29 -0800 (PST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.fe-sfbay-09.sun.com by fe-sfbay-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KWL00600396VF00@fe-sfbay-09.sun.com>; Wed, 20 Jan 2010 22:29:29 -0800 (PST) Received: from localhost.localdomain ([unknown] [75.36.251.46]) by fe-sfbay-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KWL003MR3C23V10@fe-sfbay-09.sun.com>; Wed, 20 Jan 2010 22:29:28 -0800 (PST) Date: Wed, 20 Jan 2010 22:28:23 -0800 From: Yinghai Lu Subject: [PATCH 36/36] x86: use num_processors for possible cpus In-reply-to: <1264055303-15123-1-git-send-email-yinghai@kernel.org> To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , Jesse Barnes , Christoph Lameter Cc: Linus Torvalds , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Message-id: <1264055303-15123-37-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1264055303-15123-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f741c33..642440c 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1190,7 +1190,6 @@ early_param("possible_cpus", _setup_possible_cpus); * - Ashok Raj * * Three ways to find out the number of additional hotplug CPUs: - * - If the BIOS specified disabled CPUs in ACPI/mptables use that. * - The user can overwrite it with possible_cpus=NUM * - Otherwise don't reserve additional CPUs. * We do this because additional CPUs waste a lot of memory. @@ -1205,7 +1204,7 @@ __init void prefill_possible_map(void) num_processors = 1; if (setup_possible_cpus == -1) - possible = num_processors + disabled_cpus; + possible = num_processors; else possible = setup_possible_cpus;