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: 66812 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2334717qge; Wed, 27 Apr 2016 11:08:05 -0700 (PDT) X-Received: by 10.66.63.104 with SMTP id f8mr13943862pas.109.1461780483512; Wed, 27 Apr 2016 11:08:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gs6si6480877pac.81.2016.04.27.11.08.03; Wed, 27 Apr 2016 11:08:03 -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 S1753712AbcD0SHt (ORCPT + 29 others); Wed, 27 Apr 2016 14:07:49 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:35652 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533AbcD0SHn (ORCPT ); Wed, 27 Apr 2016 14:07:43 -0400 Received: by mail-pa0-f65.google.com with SMTP id zy2so6619944pac.2; 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=FBQwwimu9VyAKCJBsalCjSjj0cqyFGzb/QVfwljzeeAAI3CW5cxkeWLjqD84nEJUZx kEucsfSA4JUdZ4oGqSiJ/oduaN1Q1phKSKYH/7qR74u1+AHm3v+Z15ua5uZFmy/8xleh alwXOBgdPYIL2mtmZYGF0pySAVEKcWfCkPpEWiKHWCVXCxcQF2enVY138Hx13DesnVH6 GRFFGB9DmlJw3bd0DIPzXlZ5eAdEZF1sCiSSPa4BCWYJ7bF/JKhPZoBzlzUt8CBVrYdc SANvxIBnR3KSij3zKh5eFgb00OX1O0ICBLi8RfS5y81TFYayXuKo124gI8VUTLR/RIee b7uw== X-Gm-Message-State: AOPr4FUA/62yOfdrfyGtLKHWS7m+GUBLwN5h6Eo7Wkxea3P9saJdpXFF54Ls9EFklnHTRA== 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 Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney 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> 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); }