Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756255AbbDJRnw (ORCPT ); Fri, 10 Apr 2015 13:43:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44464 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751377AbbDJRnu (ORCPT ); Fri, 10 Apr 2015 13:43:50 -0400 Date: Fri, 10 Apr 2015 10:43:29 -0700 From: tip-bot for Mike Travis Message-ID: Cc: hedi@sgi.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, sivanich@sgi.com, hpa@zytor.com, travis@sgi.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, travis@sgi.com, hpa@zytor.com, sivanich@sgi.com, hedi@sgi.com, mingo@kernel.org In-Reply-To: <20150409182628.952357922@asylum.americas.sgi.com> References: <20150409182628.952357922@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/apic/uv: Update the APIC UV OEM check Git-Commit-ID: 7a4e017041136de05527722b97e0c1f8702a5cbe 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: 1557 Lines: 40 Commit-ID: 7a4e017041136de05527722b97e0c1f8702a5cbe Gitweb: http://git.kernel.org/tip/7a4e017041136de05527722b97e0c1f8702a5cbe Author: Mike Travis AuthorDate: Thu, 9 Apr 2015 13:26:29 -0500 Committer: Ingo Molnar CommitDate: Fri, 10 Apr 2015 10:16:07 +0200 x86/apic/uv: Update the APIC UV OEM check Optimize the first "SGI" OEM check to return faster if the system is not an SGI or UV system. Signed-off-by: Mike Travis Acked-by: Hedi Berriche Acked-by: Dimitri Sivanich Link: http://lkml.kernel.org/r/20150409182628.952357922@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 8e9dcfd..2a739a9 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -146,6 +146,9 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) { int pnodeid, is_uv1, is_uv2, is_uv3; + if (strncmp(oem_id, "SGI", 3) != 0) + return 0; + is_uv1 = !strcmp(oem_id, "SGI"); is_uv2 = !strcmp(oem_id, "SGI2"); is_uv3 = !strncmp(oem_id, "SGI3", 4); /* there are varieties of UV3 */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/