From patchwork Fri Jan 22 09:24:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 74527 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 o0M9RGpx008300 for ; Fri, 22 Jan 2010 09:27:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583Ab0AVJ0Q (ORCPT ); Fri, 22 Jan 2010 04:26:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753312Ab0AVJ0M (ORCPT ); Fri, 22 Jan 2010 04:26:12 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:46249 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753477Ab0AVJ0F (ORCPT ); Fri, 22 Jan 2010 04:26:05 -0500 Received: from fe-sfbay-10.sun.com ([192.18.43.129]) by sca-es-mail-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id o0M9Q5ID007998; Fri, 22 Jan 2010 01:26:05 -0800 (PST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from conversion-daemon.fe-sfbay-10.sun.com by fe-sfbay-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KWN00E005YCZE00@fe-sfbay-10.sun.com>; Fri, 22 Jan 2010 01:26:05 -0800 (PST) Received: from localhost.localdomain ([unknown] [75.36.240.128]) by fe-sfbay-10.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KWN00C0Y662A4B0@fe-sfbay-10.sun.com>; Fri, 22 Jan 2010 01:26:02 -0800 (PST) Date: Fri, 22 Jan 2010 01:24:47 -0800 From: Yinghai Lu Subject: [PATCH 38/38] x86: use num_processors for possible cpus In-reply-to: <1264152287-13866-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: <1264152287-13866-39-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1264152287-13866-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;