summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuss Anderson <rja@sgi.com>2009-04-03 17:24:23 -0500
committerIngo Molnar <mingo@elte.hu>2009-04-08 14:58:10 +0200
commit06aa05b307e8efbc278f201198e7cdf3877bc5c2 (patch)
treebe36eabd74f3dec2d88dcf2ec03a732c07de0aee
parent6a891a24e4d0056c365a90ff2d71c38fd366b0d0 (diff)
downloadblackbird-op-linux-06aa05b307e8efbc278f201198e7cdf3877bc5c2.tar.gz
blackbird-op-linux-06aa05b307e8efbc278f201198e7cdf3877bc5c2.zip
x86: prevent /sys/firmware/sgi_uv from being created on non-uv systems
/sys/firmware/sgi_uv should only be created on uv systems. Signed-off-by: Russ Anderson <rja@sgi.com> LKML-Reference: <20090403222423.GA28546@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/uv_sysfs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/kernel/uv_sysfs.c
index 67f9b9dbf800..36afb98675a4 100644
--- a/arch/x86/kernel/uv_sysfs.c
+++ b/arch/x86/kernel/uv_sysfs.c
@@ -21,6 +21,7 @@
#include <linux/sysdev.h>
#include <asm/uv/bios.h>
+#include <asm/uv/uv.h>
struct kobject *sgi_uv_kobj;
@@ -47,6 +48,9 @@ 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);
if (!sgi_uv_kobj) {
OpenPOWER on IntegriCloud