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,
travis@sgi.com, tglx@linutronix.de, hpa@linux.intel.com,
sivanich@sgi.com
Subject: [tip:x86/uv] x86, uv, uv3: Check current gru hub support for SGI UV3
Date: Mon, 11 Feb 2013 20:22:45 -0800 [thread overview]
Message-ID: <tip-385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3@git.kernel.org> (raw)
In-Reply-To: <20130211194509.035828372@gulag1.americas.sgi.com>
Commit-ID: 385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3
Gitweb: http://git.kernel.org/tip/385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3
Author: Mike Travis <travis@sgi.com>
AuthorDate: Mon, 11 Feb 2013 13:45:14 -0600
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 11 Feb 2013 17:18:19 -0800
x86, uv, uv3: Check current gru hub support for SGI UV3
This patch checks current hub support to avoid panicing the
system until all the GRU changes for UV3+ are in place.
Signed-off-by: Mike Travis <travis@sgi.com>
Link: http://lkml.kernel.org/r/20130211194509.035828372@gulag1.americas.sgi.com
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
drivers/misc/sgi-gru/grufile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 492c8ca..44d273c 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -517,7 +517,7 @@ static int __init gru_init(void)
{
int ret;
- if (!is_uv_system())
+ if (!is_uv_system() || (is_uvx_hub() && !is_uv2_hub()))
return 0;
#if defined CONFIG_IA64
next prev parent reply other threads:[~2013-02-12 4:22 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:x86/uv] x86, uv, uv3: " tip-bot for Mike Travis
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-bot for Mike Travis [this message]
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-385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3@git.kernel.org \
--to=travis@sgi.com \
--cc=hpa@linux.intel.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 \
/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;
as well as URLs for NNTP newsgroup(s).