From patchwork Tue May 24 22:35:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 68537 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp892084qge; Tue, 24 May 2016 15:38:32 -0700 (PDT) X-Received: by 10.98.96.130 with SMTP id u124mr937638pfb.28.1464129512397; Tue, 24 May 2016 15:38:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b16si1693916pfj.23.2016.05.24.15.38.32; Tue, 24 May 2016 15:38:32 -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 S1754568AbcEXWiD (ORCPT + 30 others); Tue, 24 May 2016 18:38:03 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33606 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752284AbcEXWgM (ORCPT ); Tue, 24 May 2016 18:36:12 -0400 Received: by mail-pf0-f196.google.com with SMTP id b124so2929511pfb.0; Tue, 24 May 2016 15:36:12 -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=NOVswAFZl0cra3ILmPu7shJT912bDESoHs1SMqfPWSvTphwR2Dqv8zZ+uxYT+SN+xP PX2LmBvDk74J7aLlE0IUXsUdK3SkHSx/5aXIFzi/OLxGXTB9+OCU+tefNb9ufwbCZvi/ kRyq9ce4gplzNh3/fSw2Ne58luaTucXh69BT8SeT4iY2B50z3q7Amir6ss2pF0gzkR3E SGdZuWzpQcJW3KG2AKkDILfWJ+RjOUXnvWFyVJIEJqTzQDzH76EOPVahXYJdNt4jwofg wwqgOKbwIN013qN6e0tiruMv+QR300+ch5mBJfQ53+WNIjvQwq5i7BSs5sHt75B6N7i9 PZsA== 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=U1xrii7yeNbxsPlYy5wDdt40ozPPE3ZFGKxVQyQV7S/ZZfN9Gda4stx4OlCOrcw6va hhjmkeYnnGxjgu/JGYZC5zJkb3D1dVPy2fzUgND0YK7Ge13fLd/SVxNgUpcyW5crhv9r dayM1kSd7QfRF5EIn1cOdLf+0GYvspoq9caJ8iJOIYN/WjH4vnHe3em/TwfReOqrBV07 NC2dMLgEvDsXiBVRtisZaDQECUIhuzvz00+sCNMPIBlu0lRiIykZXN8kLde0kb5MwOSb saVBlsADF7Lmhb0eKSLAWCI79YyVR157lbkwQ8zjcTv8Z75MF9atXiFXSZp4bUhVll0W XtAg== X-Gm-Message-State: ALyK8tIHL7SATAwDH0PY+3WnXuaWGpeJcQDf/Bkuzxm20ify9HbXIsDREMfKO80nZrP0ow== X-Received: by 10.98.43.209 with SMTP id r200mr928849pfr.24.1464129371669; Tue, 24 May 2016 15:36:11 -0700 (PDT) Received: from dl.caveonetworks.com ([50.233.148.158]) by smtp.gmail.com with ESMTPSA id 7sm9329516pfn.30.2016.05.24.15.36.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 May 2016 15:36:08 -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 u4OMa2Pp019076; Tue, 24 May 2016 15:36:02 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u4OMa2IH019075; Tue, 24 May 2016 15:36:02 -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 v7 10/15] acpi, numa: remove unneeded acpi_numa=1 Date: Tue, 24 May 2016 15:35:40 -0700 Message-Id: <1464129345-18985-11-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> References: <1464129345-18985-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); }