From: tip-bot for Jack Steiner <steiner@sgi.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
steiner@sgi.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/uv] x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
Date: Fri, 3 Jun 2011 14:03:52 GMT [thread overview]
Message-ID: <tip-6885685923ee786f26e7b170e3b961ac0fa14037@git.kernel.org> (raw)
In-Reply-To: <20110602195943.GA27079@sgi.com>
Commit-ID: 6885685923ee786f26e7b170e3b961ac0fa14037
Gitweb: http://git.kernel.org/tip/6885685923ee786f26e7b170e3b961ac0fa14037
Author: Jack Steiner <steiner@sgi.com>
AuthorDate: Thu, 2 Jun 2011 14:59:43 -0500
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 3 Jun 2011 16:00:03 +0200
x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
Enable 64-bit ACPI MFCG support for SGI UV2 platform. The check
is similar to the check on UV1. UV2 has a different oem_id
string.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Link: http://lkml.kernel.org/r/20110602195943.GA27079@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/pci/mmconfig-shared.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 750c346..301e325 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -519,7 +519,8 @@ 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"))
+ if (!strcmp(mcfg->header.oem_id, "SGI") ||
+ !strcmp(mcfg->header.oem_id, "SGI2"))
return 0;
if (mcfg->header.revision >= 1) {
prev parent reply other threads:[~2011-06-03 14:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-02 19:59 [PATCH] " Jack Steiner
2011-06-03 8:28 ` Ingo Molnar
2011-06-03 13:17 ` Jack Steiner
2011-06-03 14:03 ` tip-bot for Jack Steiner [this message]
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-6885685923ee786f26e7b170e3b961ac0fa14037@git.kernel.org \
--to=steiner@sgi.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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