From patchwork Mon Apr 18 21:14:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 66059 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1503405qge; Mon, 18 Apr 2016 14:16:46 -0700 (PDT) X-Received: by 10.66.255.65 with SMTP id ao1mr52740080pad.38.1461014198153; Mon, 18 Apr 2016 14:16:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bu8si7440138pad.6.2016.04.18.14.16.37; Mon, 18 Apr 2016 14:16:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752898AbcDRVQf (ORCPT + 29 others); Mon, 18 Apr 2016 17:16:35 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35669 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbcDRVOh (ORCPT ); Mon, 18 Apr 2016 17:14:37 -0400 Received: by mail-pa0-f47.google.com with SMTP id fs9so63779383pac.2; Mon, 18 Apr 2016 14:14:37 -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=YwqSaQVF5kXLZRaD0vlhK/8SaEd+26r13cZiZJto/tyJSadMxd5nozL7f/5KSX1r9R hP8VNgYeill2JTAJtFcqqW/TooNgfNEerUrDENpL2jdyzPmMok48gzJ7lfDhMDjWTsPS jZHZLTfb07pQ8LAiJslcSVR6YMWIPrqKmehPE6/JSFt19iItjbIdHEJNZxb4mPhQN3U6 JgWBHyRv+Iipdx5TO0VT9MWxiC6fMlz/aleMWVP0sOJ1pRvGZYcsWkP6SiGW/yvhkbG2 yxKk7eqvWbyzM525BJ/NXB4TwTNG4wCcrdBszn9Wiuo9ZVCtY8RXFAfu8KnSq0FUl/tw Tujg== 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=c9bt1BSBEW3baZ1u48RVFa3+bfjqJV5c5U4iLmH9sl+Q1Bry+P/0phvwepk7O/l10f MPOYIiBjUMHTGDAXxdhZ9RYj1lgRiGlRkALaffPv5KDkgUQI3GQOVrTJ+MYwpDyiSlpK wC6MwtfBTGitRzIXnqyiT2p3LwlyVuyU6AiwLNardnKcabiR/xbz6q4PJnD1WFJFZ48K 7QbhGOfmHzYWJQR7KfPqDZc9wzVmrEKuPXPubjVYwIEG9G4tvjqSwJMhzsn8oZCLETIM vTIocmTuI7oq3oI37qq30n+3tOfJpZxJkLMqK9ziLLPYrYLEY5z4O+zytOKR/1myitTH F9nw== X-Gm-Message-State: AOPr4FXP3sA7qu3uG7QAvcDegnwgryBZfqKSGrujA6BqQtmtkZ47Jxtt6qN+AH5fTXan2Q== X-Received: by 10.66.65.169 with SMTP id y9mr52827872pas.102.1461014076745; Mon, 18 Apr 2016 14:14:36 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id 85sm85805126pfl.18.2016.04.18.14.14.29 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Apr 2016 14:14:31 -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 u3ILESkJ030873; Mon, 18 Apr 2016 14:14:28 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3ILES1i030872; Mon, 18 Apr 2016 14:14:28 -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 Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v4 09/14] acpi, numa: remove unneeded acpi_numa=1 Date: Mon, 18 Apr 2016 14:14:07 -0700 Message-Id: <1461014052-30788-10-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> References: <1461014052-30788-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 1.7.11.7 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); }