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: 9134421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 410E6607D3 for ; Tue, 24 May 2016 22:40:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3716C281E3 for ; Tue, 24 May 2016 22:40:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BBD02822B; Tue, 24 May 2016 22:40:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id E5CE1281E3 for ; Tue, 24 May 2016 22:40:54 +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 1b5Kxs-0008LO-Pj; Tue, 24 May 2016 22:38:16 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b5KwC-0006nt-3R for linux-arm-kernel@lists.infradead.org; Tue, 24 May 2016 22:36:35 +0000 Received: by mail-pf0-x242.google.com with SMTP id b124so2929509pfb.0 for ; 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=Unj1/joa++cgayRqwvfNCKvC6CZJw0QYUm3prU2kFmbjAfqFVOgz3YToIBZTUcXKJA GnLWLZRcXTH2uFd4Edk1AW2Kxb9s0PH4I8ZWs02HGszPhxticaE4jenVn8Wrvs1wLH1Q RvfFCuHo5gRok9S101sUmXUidEXXipwlFqx8WJRihfb+LiDDqWKhkTHXb6SpVboOYScd GZ8m4H9BXdIfay6ZECd4HSVXs5Y4upnTuNf8mZIQt5ZqMmipPd1JDVnlm6LDXNa4NXmG ajHs5h+h8l519SKoR2XC4+DK9twviMOVzcn3y2TYNy5f8zc2UZ1q5pcUMzfg1zLYBS99 nIlQ== X-Gm-Message-State: ALyK8tJLi8tRAXEct2zzvOCY/OJZc0XB2scMqr1dBuyAmNYMQFCmcpYW241bYZGuHubzIg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160524_153632_279985_C8EFC496 X-CRM114-Status: GOOD ( 12.89 ) 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-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); }