From patchwork Wed Apr 27 18:07:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 8961291 Return-Path: X-Original-To: patchwork-linux-arm@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 0E0ABBF29F for ; Wed, 27 Apr 2016 18:11:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C11C2021F for ; Wed, 27 Apr 2016 18:11:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 677212015A for ; Wed, 27 Apr 2016 18:11:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1avTuU-0001QG-QG; Wed, 27 Apr 2016 18:10:02 +0000 Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1avTsY-0007at-TX for linux-arm-kernel@lists.infradead.org; Wed, 27 Apr 2016 18:08:04 +0000 Received: by mail-pa0-x242.google.com with SMTP id vv3so6523604pab.0 for ; Wed, 27 Apr 2016 11:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ma6TSfINmWbBmdi/KOWU/aEeBgY1TKQ4JkPFR8tmPzM=; b=yJa9/oWRIrgfOHOldJVfavmIHkJChTOKU/ZBj9IV6DSu5vFTkZZSyAA2TIEsTZFvT7 kGgCxMqRD3KPMODnBPYGm8UjF8aJtFMyGfkDccf80bgB7EDWIGBpyDTg2GrAKepx6T4s lxUcbS1hxhSTTlpEKDiruH+MnurpS33q9cgBVjvjW7ASt3gV3oBbIljM7fOsTR/dfA12 XY0erxpeS9pF+ks6Mg1YD0oaTQxQ14GJ9URHnor6mFmgAkhU3QUuEzDI8aCuHLQfVc59 k9OqVgaCCkOFgyJFgX4v4fC3ceTu4Yv4PFUSIpAhHh5aoInW83Ml4KsDw2RGkzbSzOge SDBw== 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=ma6TSfINmWbBmdi/KOWU/aEeBgY1TKQ4JkPFR8tmPzM=; b=BO2TqUsaGyicMv4elDF2Pi320lbQiBeO/LgCB6bo3CHL95ofn75ymNP25IBjzjO+bD hQJvxKEi35D8yj4sBFuaNSIsaIzal4ye4q1WDzIjik4+1fgaKPafQgpXyWkH8Eax9XEV KuiPOONtGvzQWwu91UDOzFY6IHyB7HuFo58MZznvfAB9yA+OAkuGwI2oyosj4+2FRA6v L6JwtSCXT7mIJIuwEoqYvf1q9ehUIdEg6x2uqNT9YHeieM+fg5/KO3AKQ9VJO2SBkqlU 6L3l0oXfKjG/srI8mjeZmM5/E3jciw8GwRRDAb2Gg8uQ6uxi5V+BYOJTsvU3oC1eqnoJ lUFw== X-Gm-Message-State: AOPr4FV7V4hlZRtXlg5n0H98j/9t6c8f+5sH38YSne1bn16d4ExyfFaQ9jc2fE0RjmksVA== X-Received: by 10.66.141.144 with SMTP id ro16mr13890511pab.137.1461780462081; Wed, 27 Apr 2016 11:07:42 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id xd14sm15287226pac.6.2016.04.27.11.07.33 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Apr 2016 11:07:39 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u3RI7XcM027271; Wed, 27 Apr 2016 11:07:33 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3RI7WsC027270; Wed, 27 Apr 2016 11:07:32 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Subject: [PATCH v6 10/14] acpi, numa: remove unneeded acpi_numa=1 Date: Wed, 27 Apr 2016 11:07:12 -0700 Message-Id: <1461780436-27182-11-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> References: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160427_110803_127319_3194F966 X-CRM114-Status: GOOD ( 12.47 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Richter , linux-kernel@vger.kernel.org, David Daney MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 From: Hanjun Guo acpi_numa is default to 0, it's set to -1 when disable acpi numa or when a bad SRAT is parsed, and it's only consumed in srat_disabled() (compare it with 0) to continue parse the SRAT or not, so we don't need to set acpi_numa to 1 when we get a valid SRAT entry. Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter Signed-off-by: David Daney --- arch/x86/mm/srat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 4217071f..30460f5 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c @@ -59,7 +59,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) } set_apicid_to_node(apic_id, node); node_set(node, numa_nodes_parsed); - acpi_numa = 1; printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n", pxm, apic_id, node); } @@ -101,7 +100,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) set_apicid_to_node(apic_id, node); node_set(node, numa_nodes_parsed); - acpi_numa = 1; printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n", pxm, apic_id, node); }