diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 20:12:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 20:12:57 -0800 |
| commit | 1a13c0b181f218bf56a1a6b8edbaf2876b22314b (patch) | |
| tree | a7e2442b591cef28730dc6a4e54a6976e7719d3d /drivers | |
| parent | f98982ce80f9ce6db0fe841c1844cbae0a2700fb (diff) | |
| parent | d924f947a44684796eee6fa488a9fe7876923c3b (diff) | |
| download | linux-3.10-1a13c0b181f218bf56a1a6b8edbaf2876b22314b.tar.gz linux-3.10-1a13c0b181f218bf56a1a6b8edbaf2876b22314b.tar.bz2 linux-3.10-1a13c0b181f218bf56a1a6b8edbaf2876b22314b.zip | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 UV3 support update from Ingo Molnar:
"Support for the SGI Ultraviolet System 3 (UV3) platform - the upcoming
third major iteration and upscaling of the SGI UV supercomputing
platform."
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, uv, uv3: Trim MMR register definitions after code changes for SGI UV3
x86, uv, uv3: Check current gru hub support for SGI UV3
x86, uv, uv3: Update Time Support for SGI UV3
x86, uv, uv3: Update x2apic Support for SGI UV3
x86, uv, uv3: Update Hub Info for SGI UV3
x86, uv, uv3: Update ACPI Check to include SGI UV3
x86, uv, uv3: Update MMR register definitions for SGI Ultraviolet System 3 (UV3)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 492c8cac69a..44d273c5e19 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 |