diff options
| author | Russ Anderson <rja@sgi.com> | 2009-04-03 18:24:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 08:58:10 -0400 |
| commit | 06aa05b307e8efbc278f201198e7cdf3877bc5c2 (patch) | |
| tree | be36eabd74f3dec2d88dcf2ec03a732c07de0aee | |
| parent | 6a891a24e4d0056c365a90ff2d71c38fd366b0d0 (diff) | |
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.c | 4 |
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 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/sysdev.h> | 22 | #include <linux/sysdev.h> |
| 23 | #include <asm/uv/bios.h> | 23 | #include <asm/uv/bios.h> |
| 24 | #include <asm/uv/uv.h> | ||
| 24 | 25 | ||
| 25 | struct kobject *sgi_uv_kobj; | 26 | struct kobject *sgi_uv_kobj; |
| 26 | 27 | ||
| @@ -47,6 +48,9 @@ static int __init sgi_uv_sysfs_init(void) | |||
| 47 | { | 48 | { |
| 48 | unsigned long ret; | 49 | unsigned long ret; |
| 49 | 50 | ||
| 51 | if (!is_uv_system()) | ||
| 52 | return -ENODEV; | ||
| 53 | |||
| 50 | if (!sgi_uv_kobj) | 54 | if (!sgi_uv_kobj) |
| 51 | sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj); | 55 | sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj); |
| 52 | if (!sgi_uv_kobj) { | 56 | if (!sgi_uv_kobj) { |
