[Patch] sgi-xp sgi-gru Allow modules to load on non-uv systems.

[Robin Holt]

For an upcoming distro release, we need to have the xp kernel module
loadable even when not on UV equipment.  The xpc module will not load.
This will allow one set of modules dependent upon xp to work on either
UV or non-UV equipment.

Signed-off-by: Robin Holt <holt@xxxxxxx>
Signed-off-by: Jack Steiner <steiner@xxxxxxx>

---

 drivers/misc/sgi-gru/grufile.c |    2 +-
 drivers/misc/sgi-xp/xp_main.c  |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
Index: 20090417/drivers/misc/sgi-gru/grufile.c
===================================================================
--- 20090417.orig/drivers/misc/sgi-gru/grufile.c	2009-04-17 07:39:38.000000000 -0500
+++ 20090417/drivers/misc/sgi-gru/grufile.c	2009-04-17 08:46:01.756544851 -0500
@@ -375,7 +375,7 @@ static int __init gru_init(void)
 	void *gru_start_vaddr;
 
 	if (!is_uv_system())
-		return -ENODEV;
+		return 0;
 
 #if defined CONFIG_IA64
 	gru_start_paddr = 0xd000000000UL; /* ZZZZZZZZZZZZZZZZZZZ fixme */
Index: 20090417/drivers/misc/sgi-xp/xp_main.c
===================================================================
--- 20090417.orig/drivers/misc/sgi-xp/xp_main.c	2009-04-17 07:39:38.000000000 -0500
+++ 20090417/drivers/misc/sgi-xp/xp_main.c	2009-04-17 10:21:02.912293772 -0500
@@ -248,19 +248,19 @@ xp_init(void)
 	enum xp_retval ret;
 	int ch_number;
 
+	/* initialize the connection registration mutex */
+	for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
+		mutex_init(&xpc_registrations[ch_number].mutex);
+
 	if (is_shub())
 		ret = xp_init_sn2();
 	else if (is_uv())
 		ret = xp_init_uv();
 	else
-		ret = xpUnsupported;
+		ret = 0;
 
 	if (ret != xpSuccess)
-		return -ENODEV;
-
-	/* initialize the connection registration mutex */
-	for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
-		mutex_init(&xpc_registrations[ch_number].mutex);
+		return ret;
 
 	return 0;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/