summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/genx2apic_uv_x.c
diff options
context:
space:
mode:
authorCliff Wickman <cpw@sgi.com>2008-11-10 16:16:31 -0600
committerIngo Molnar <mingo@elte.hu>2008-11-11 11:38:50 +0100
commita3d732f93785da17e0137210deadb4616f5536fc (patch)
tree4b7bdbaf63369063a1478c4d91d027bcd82fc271 /arch/x86/kernel/genx2apic_uv_x.c
parent7d9d1f25c3872080ce599e5dd0dac3305d0a028b (diff)
x86, UV: fix redundant creation of sgi_uv
Impact: fix double entry creation in /proc There is a collision between two UV functions: both uv_ptc_init() and gru_proc_init() try to make /proc/sgi_uv So move it's creation to a single place: uv_system_init() Signed-off-by: Cliff Wickman <cpw@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/genx2apic_uv_x.c')
-rw-r--r--arch/x86/kernel/genx2apic_uv_x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index 85fb7dd48f6..d7213a1cb78 100644
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/hardirq.h>
#include <linux/timer.h>
+#include <linux/proc_fs.h>
#include <asm/current.h>
#include <asm/smp.h>
#include <asm/ipi.h>
@@ -570,4 +571,5 @@ void __init uv_system_init(void)
uv_cpu_init();
uv_scir_register_cpu_notifier();
+ proc_mkdir("sgi_uv", NULL);
}