From patchwork Wed May 26 15:03:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 102415 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 o4QF3jGw022930 for ; Wed, 26 May 2010 15:03:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755370Ab0EZPDo (ORCPT ); Wed, 26 May 2010 11:03:44 -0400 Received: from cantor.suse.de ([195.135.220.2]:46331 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797Ab0EZPDn (ORCPT ); Wed, 26 May 2010 11:03:43 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 0D65193A00; Wed, 26 May 2010 17:03:43 +0200 (CEST) From: Thomas Renninger Cc: Thomas Renninger , travis@sgi.com, linux-acpi@vger.kernel.org, lenb@kernel.org Subject: [PATCH] ACPI: Do not try to set up acpi processor stuff on cores exceeding maxcpus= Date: Wed, 26 May 2010 17:03:33 +0200 Message-Id: <1274886213-16337-1-git-send-email-trenn@suse.de> X-Mailer: git-send-email 1.6.3 To: unlisted-recipients:; (no To-header on input) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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]); Wed, 26 May 2010 15:03:48 +0000 (UTC) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 5675d97..7615bc2 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -581,6 +581,11 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) return 0; } +#ifdef CONFIG_SMP + if (pr->id >= setup_max_cpus && pr->id != 0) + return 0; +#endif + BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0)); /* diff --git a/init/main.c b/init/main.c index 22881b5..fc104db 100644 --- a/init/main.c +++ b/init/main.c @@ -125,7 +125,9 @@ static char *ramdisk_execute_command; #ifdef CONFIG_SMP /* Setup configured maximum number of CPUs to activate */ -unsigned int __initdata setup_max_cpus = NR_CPUS; +unsigned int setup_max_cpus = NR_CPUS; +EXPORT_SYMBOL(setup_max_cpus); + /* * Setup routine for controlling SMP activation