Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935311AbcLOLxQ (ORCPT ); Thu, 15 Dec 2016 06:53:16 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42360 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755419AbcLOLxM (ORCPT ); Thu, 15 Dec 2016 06:53:12 -0500 Date: Thu, 15 Dec 2016 03:52:40 -0800 From: tip-bot for Boris Ostrovsky Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com, tglx@linutronix.de, hpa@zytor.com Reply-To: hpa@zytor.com, tglx@linutronix.de, boris.ostrovsky@oracle.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1481570993-13941-1-git-send-email-boris.ostrovsky@oracle.com> References: <1481570993-13941-1-git-send-email-boris.ostrovsky@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/acpi: Use proper macro for invalid node Git-Commit-ID: 4370a3ef39f3d07342a1ae9967701bd697c8d9df X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1204 Lines: 36 Commit-ID: 4370a3ef39f3d07342a1ae9967701bd697c8d9df Gitweb: http://git.kernel.org/tip/4370a3ef39f3d07342a1ae9967701bd697c8d9df Author: Boris Ostrovsky AuthorDate: Mon, 12 Dec 2016 14:29:52 -0500 Committer: Thomas Gleixner CommitDate: Thu, 15 Dec 2016 11:32:32 +0100 x86/acpi: Use proper macro for invalid node Use NUMA_NO_NODE instead of -1. Signed-off-by: Boris Ostrovsky Cc: len.brown@intel.com Cc: rjw@rjwysocki.net Cc: linux-acpi@vger.kernel.org Cc: pavel@ucw.cz Link: http://lkml.kernel.org/r/1481570993-13941-1-git-send-email-boris.ostrovsky@oracle.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/acpi/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 4764fa5..6f65b0e 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -715,7 +715,7 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) int nid; nid = acpi_get_node(handle); - if (nid != -1) { + if (nid != NUMA_NO_NODE) { set_apicid_to_node(physid, nid); numa_set_node(cpu, nid); }