public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Mike Travis <travis@sgi.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	yinghai@kernel.org, travis@sgi.com, sivanich@sgi.com,
	gregkh@linuxfoundation.org, rja@sgi.com, bhelgaas@google.com,
	tglx@linutronix.de, liuj97@gmail.com, hpa@linux.intel.com
Subject: [tip:x86/uv] x86, uv, uv3: Update ACPI Check to include SGI UV3
Date: Mon, 11 Feb 2013 20:18:09 -0800	[thread overview]
Message-ID: <tip-526018bc5eccfe3177780f03d2aaba0efee40720@git.kernel.org> (raw)
In-Reply-To: <20130211194508.457937455@gulag1.americas.sgi.com>

Commit-ID:  526018bc5eccfe3177780f03d2aaba0efee40720
Gitweb:     http://git.kernel.org/tip/526018bc5eccfe3177780f03d2aaba0efee40720
Author:     Mike Travis <travis@sgi.com>
AuthorDate: Mon, 11 Feb 2013 13:45:10 -0600
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 11 Feb 2013 17:17:44 -0800

x86, uv, uv3: Update ACPI Check to include SGI UV3

Add UV3 to exclusion list.  Instead of adding every new series of
SGI UV systems, just check oem_id to have a prefix of "SGI".

Signed-off-by: Mike Travis <travis@sgi.com>
Link: http://lkml.kernel.org/r/20130211194508.457937455@gulag1.americas.sgi.com
Acked-by: Russ Anderson <rja@sgi.com>
Reviewed-by: Dimitri Sivanich <sivanich@sgi.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/pci/mmconfig-shared.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index fb29968..082e881 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -548,8 +548,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
 	if (cfg->address < 0xFFFFFFFF)
 		return 0;
 
-	if (!strcmp(mcfg->header.oem_id, "SGI") ||
-			!strcmp(mcfg->header.oem_id, "SGI2"))
+	if (!strncmp(mcfg->header.oem_id, "SGI", 3))
 		return 0;
 
 	if (mcfg->header.revision >= 1) {

  reply	other threads:[~2013-02-12  4:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-11 19:45 [PATCH 0/7] x86/UV/UV3: Kernel Updates for SGI UV3 Mike Travis
2013-02-11 19:45 ` [PATCH 1/7] x86/UV/UV3: Update MMR register definitions for SGI Ultraviolet System 3 (UV3) Mike Travis
2013-02-12  4:17   ` [tip:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
2013-02-11 19:45 ` [PATCH 2/7] x86/UV/UV3: Update ACPI Check to include SGI UV3 Mike Travis
2013-02-12  4:18   ` tip-bot for Mike Travis [this message]
2013-02-11 19:45 ` [PATCH 3/7] x86/UV/UV3: Update Hub Info for " Mike Travis
2013-02-12  4:19   ` [tip:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
2013-02-11 19:45 ` [PATCH 4/7] x86/UV/UV3: Update x2apic Support " Mike Travis
2013-02-12  4:20   ` [tip:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
2013-02-11 19:45 ` [PATCH 5/7] x86/UV/UV3: Update Time " Mike Travis
2013-02-12  4:21   ` [tip:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
2013-02-11 19:45 ` [PATCH 6/7] x86/UV/UV3: Check current gru hub support " Mike Travis
2013-02-12  4:22   ` [tip:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
2013-02-11 19:45 ` [PATCH 7/7] x86/UV/UV3: Trim MMR register definitions after code changes " Mike Travis
2013-02-12  4:23   ` [tip:x86/uv] x86, uv, uv3: " 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-526018bc5eccfe3177780f03d2aaba0efee40720@git.kernel.org \
    --to=travis@sgi.com \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=liuj97@gmail.com \
    --cc=mingo@kernel.org \
    --cc=rja@sgi.com \
    --cc=sivanich@sgi.com \
    --cc=tglx@linutronix.de \
    --cc=yinghai@kernel.org \
    /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