projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0af6352)
x86, uv, uv3: Check current gru hub support for SGI UV3
authorMike Travis <travis@sgi.com>
Mon, 11 Feb 2013 19:45:14 +0000 (13:45 -0600)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 12 Feb 2013 01:18:19 +0000 (17:18 -0800)
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 patch | blob | blame | history

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 492c8cac69acfbd78d6ee33170b58617d8891bc3..44d273c5e19d7befc7161f566b42f7e3e544ad18 100644 (file)
--- 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