From: tip-bot for Mike Travis <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hedi@sgi.com, mingo@kernel.org, tglx@linutronix.de,
linux-kernel@vger.kernel.org, sivanich@sgi.com, hpa@zytor.com,
travis@sgi.com
Subject: [tip:x86/apic] x86/apic/uv: Update the APIC UV OEM check
Date: Fri, 10 Apr 2015 10:43:29 -0700 [thread overview]
Message-ID: <tip-7a4e017041136de05527722b97e0c1f8702a5cbe@git.kernel.org> (raw)
In-Reply-To: <20150409182628.952357922@asylum.americas.sgi.com>
Commit-ID: 7a4e017041136de05527722b97e0c1f8702a5cbe
Gitweb: http://git.kernel.org/tip/7a4e017041136de05527722b97e0c1f8702a5cbe
Author: Mike Travis <travis@sgi.com>
AuthorDate: Thu, 9 Apr 2015 13:26:29 -0500
Committer: Ingo Molnar <mingo@kernel.org>
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 <travis@sgi.com>
Acked-by: Hedi Berriche <hedi@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/20150409182628.952357922@asylum.americas.sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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 */
next prev parent reply other threads:[~2015-04-10 17:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-09 18:26 [PATCH 0/3] UV: Update UV APIC checks for new systems Mike Travis
2015-04-09 18:26 ` [PATCH 1/3] X86, UV: Update UV APIC OEM check Mike Travis
2015-04-10 17:43 ` tip-bot for Mike Travis [this message]
2015-04-09 18:26 ` [PATCH 2/3] X86, UV: Update UV APIC driver check Mike Travis
2015-04-10 17:43 ` [tip:x86/apic] x86/apic/uv: Update the " tip-bot for Mike Travis
2015-04-09 18:26 ` [PATCH 3/3] X86, UV: Update UV APIC HUB check Mike Travis
2015-04-10 17:44 ` [tip:x86/apic] x86/apic/uv: Update the " tip-bot for Mike Travis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7a4e017041136de05527722b97e0c1f8702a5cbe@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hedi@sgi.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sivanich@sgi.com \
--cc=tglx@linutronix.de \
--cc=travis@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome