From patchwork Tue Feb 9 19:32:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 78129 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o19JcRGo031420 for ; Tue, 9 Feb 2010 19:38:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752438Ab0BITgw (ORCPT ); Tue, 9 Feb 2010 14:36:52 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:54638 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273Ab0BITdt (ORCPT ); Tue, 9 Feb 2010 14:33:49 -0500 Received: from fe-sfbay-09.sun.com ([192.18.43.129]) by sca-es-mail-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id o19JXci1001154; Tue, 9 Feb 2010 11:33:46 -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 <0KXL00B00A68SI00@fe-sfbay-09.sun.com>; Tue, 09 Feb 2010 11:33:43 -0800 (PST) Received: from localhost.localdomain ([unknown] [129.146.52.180]) by fe-sfbay-09.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KXL00F2VABRK400@fe-sfbay-09.sun.com>; Tue, 09 Feb 2010 11:33:36 -0800 (PST) Date: Tue, 09 Feb 2010 11:32:46 -0800 From: Yinghai Lu Subject: [PATCH 35/35] x86: use num_processors for possible cpus In-reply-to: <1265743966-17065-1-git-send-email-yinghai@kernel.org> To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , Linus Torvalds Cc: Jesse Barnes , Christoph Lameter , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Message-id: <1265743966-17065-36-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1265743966-17065-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Feb 2010 19:38:28 +0000 (UTC) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index efdf81e..2a25e74 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1194,7 +1194,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. @@ -1209,7 +1208,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;