From patchwork Mon Jan 11 22:02:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8012191 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E48A2BEEE5 for ; Mon, 11 Jan 2016 22:05:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D8CB201C8 for ; Mon, 11 Jan 2016 22:05:58 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 191E9201BB for ; Mon, 11 Jan 2016 22:05:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aIkXp-00059s-MC; Mon, 11 Jan 2016 22:02:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aIkXo-00059k-QB for xen-devel@lists.xen.org; Mon, 11 Jan 2016 22:02:32 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 2C/88-25435-87624965; Mon, 11 Jan 2016 22:02:32 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1452549750!12353755!1 X-Originating-IP: [209.85.160.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60985 invoked from network); 11 Jan 2016 22:02:31 -0000 Received: from mail-yk0-f196.google.com (HELO mail-yk0-f196.google.com) (209.85.160.196) by server-8.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Jan 2016 22:02:31 -0000 Received: by mail-yk0-f196.google.com with SMTP id k129so34626601yke.3 for ; Mon, 11 Jan 2016 14:02:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9DmMxOOtNdRmlsYaBjQW3JoTSXRJgD6aXb4gKardKQA=; b=dD+X0cidt1Ph7aFPKSzjYcMq7sBruLGmRFyMkOfsmvVfGOWCmMJY9jwRogapb1ieeQ sBKBt5Ric9VThxhs0RbZM0gn3OrJIi5w30hPYYuTvk11rd6TP6hWyH0UdHij0tZM3qhZ +ONXaljFPNGdBT4rrvaazD7gk+ZEhJfKgfOXRuUEJd0+Eq3/4TgX8qMyH1iuH73yBtIo tlpuJNEiPgrQ/gFf0tC4I7LT9HeZH7jNbGPLFTJcszNnImgOFGNAnuJdfywxIQbhxz6E 2ztRhTBtoYZtIWMP2rJQrQVpeRWgRovdrju/sEwaRKUjCchyKrTtNq4VwwTeJBO2GFax 87DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9DmMxOOtNdRmlsYaBjQW3JoTSXRJgD6aXb4gKardKQA=; b=CBHKTGduLkuImhLASGc4iAMeDezNzlrAWZdQwWeyw925MED3LwOVSWcZjYIK2Vqq63 n1s3T7zi0UaLkc3pOJeMVDx1foomnREX81kRIOtESCtHeQm59RM2Q31Fc8Wx29FLYZGc 0mGCDMYHp5sr/dXOB0gRP2655HCCqdut4O1rmPiibyvyL/KNzTJrfSixdzA6kX9kC0JI /0jq9jw8Vj3zQGiloWwYyNY0aHwgEVxfr8dKt3+zEBh4cYqYuhJHxM3//fhdYzQRnnRX PDeq/KnpvZsprq/RKsEARLDskas9fH13PeHXQ9G7NoJMEyTIoVTTfBRxB8ply+uphoUa hH/A== X-Gm-Message-State: ALoCoQktjtj68q5fh27kFrsS18J9u9RS0mtUXXEtLlTooheC9sCtLPD0slhS2KeAh1wvmRNkm8LxR8dwgdmSETn/nbTgMiru0w== X-Received: by 10.129.91.215 with SMTP id p206mr15150512ywb.188.1452549750019; Mon, 11 Jan 2016 14:02:30 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id j82sm80102297ywg.36.2016.01.11.14.02.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 14:02:28 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Mon, 11 Jan 2016 16:02:13 -0600 Message-Id: <1452549733-13401-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1452549733-13401-1-git-send-email-cardoe@cardoe.com> References: <1452549733-13401-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Ian Campbell , Andrew Cooper , Doug Goldstein , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v2 2/2] build: convert NR_CPUS to Kconfig X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use CONFIG_NR_CPUS from Kconfig as NR_CPUS instead of the previous MAX_PHYS_CPUS variable from make. Remove the creation of MAX_PHYS_CPUS as well. CC: Ian Campbell CC: Stefano Stabellini CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Signed-off-by: Doug Goldstein --- xen/Rules.mk | 3 --- xen/include/asm-arm/config.h | 6 ------ xen/include/asm-x86/config.h | 6 ------ xen/include/xen/config.h | 3 +++ 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index f7ddc69..b5f1041 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,9 +61,6 @@ CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER -ifneq ($(max_phys_cpus),) -CFLAGS-y += -DMAX_PHYS_CPUS=$(max_phys_cpus) -endif ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 1520b41..bd832df 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -45,12 +45,6 @@ #define OPT_CONSOLE_STR "dtuart" -#ifdef MAX_PHYS_CPUS -#define NR_CPUS MAX_PHYS_CPUS -#else -#define NR_CPUS 128 -#endif - #ifdef CONFIG_ARM_64 #define MAX_VIRT_CPUS 128 #else diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index f25d92e..3958ea0 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -60,12 +60,6 @@ #define OPT_CONSOLE_STR "vga" -#ifdef MAX_PHYS_CPUS -#define NR_CPUS MAX_PHYS_CPUS -#else -#define NR_CPUS 256 -#endif - /* Linkage for x86 */ #define __ALIGN .align 16,0x90 #define __ALIGN_STR ".align 16,0x90" diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 7595599..cde2006 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -92,4 +92,7 @@ #define FLASK_AVC_STATS 1 #endif +/* allow existing code to work with Kconfig variable */ +#define NR_CPUS CONFIG_NR_CPUS + #endif /* __XEN_CONFIG_H__ */