Subject: [patch bugfix (take 2)] x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems

From: Russ Anderson <[email-masked]>
Date: Fri, 3 Apr 2009 17:24:23 -0500

/sys/firmware/sgi_uv should only be created on uv systems.

Signed-off-by: Russ Anderson <[email-masked]>

---
The previous patch was an old version.  

 arch/x86/kernel/uv_sysfs.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux/arch/x86/kernel/uv_sysfs.c
===================================================================
--- linux.orig/arch/x86/kernel/uv_sysfs.c	2009-04-03 17:16:57.000000000 -0500
+++ linux/arch/x86/kernel/uv_sysfs.c	2009-04-03 17:17:25.000000000 -0500
@@ -21,6 +21,7 @@
 
 #include <linux/sysdev.h>
 #include <asm/uv/bios.h>
+#include <asm/uv/uv.h>
 
 struct kobject *sgi_uv_kobj;
 
@@ -46,6 +47,9 @@ static struct kobj_attribute coherence_i
 static int __init sgi_uv_sysfs_init(void)
 {
 	unsigned long ret;
+
+	if (!is_uv_system())
+		return -ENODEV;
 
 	if (!sgi_uv_kobj)
 		sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj);
-- 
Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          [email-masked]