[PATCH] UV: redundant creation of sgi_uv

[PATCH] UV: redundant creation of sgi_uv

[Cliff Wickman]

From: Cliff Wickman <cpw@sgi.com>

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()

Diffed against 2.6.28-rc3

Signed-off-by: Cliff Wickman <cpw@sgi.com>
---
 arch/x86/kernel/genx2apic_uv_x.c |    2 ++
 arch/x86/kernel/tlb_uv.c         |    4 ----
 drivers/misc/sgi-gru/gruprocfs.c |    1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

Index: linux/arch/x86/kernel/genx2apic_uv_x.c
===================================================================
--- linux.orig/arch/x86/kernel/genx2apic_uv_x.c
+++ linux/arch/x86/kernel/genx2apic_uv_x.c
@@ -19,6 +19,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>
@@ -569,4 +570,5 @@ void __init uv_system_init(void)
 
 	uv_cpu_init();
 	uv_scir_register_cpu_notifier();
+	proc_mkdir("sgi_uv", NULL);
 }
Index: linux/arch/x86/kernel/tlb_uv.c
===================================================================
--- linux.orig/arch/x86/kernel/tlb_uv.c
+++ linux/arch/x86/kernel/tlb_uv.c
@@ -566,14 +566,10 @@ static int __init uv_ptc_init(void)
 	if (!is_uv_system())
 		return 0;
 
-	if (!proc_mkdir("sgi_uv", NULL))
-		return -EINVAL;
-
 	proc_uv_ptc = create_proc_entry(UV_PTC_BASENAME, 0444, NULL);
 	if (!proc_uv_ptc) {
 		printk(KERN_ERR "unable to create %s proc entry\n",
 		       UV_PTC_BASENAME);
-		remove_proc_entry("sgi_uv", NULL);
 		return -EINVAL;
 	}
 	proc_uv_ptc->proc_fops = &proc_uv_ptc_operations;
Index: linux/drivers/misc/sgi-gru/gruprocfs.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/gruprocfs.c
+++ linux/drivers/misc/sgi-gru/gruprocfs.c
@@ -317,7 +317,6 @@ int gru_proc_init(void)
 {
 	struct proc_entry *p;
 
-	proc_mkdir("sgi_uv", NULL);
 	proc_gru = proc_mkdir("sgi_uv/gru", NULL);
 
 	for (p = proc_files; p->name; p++)

Re: [PATCH] UV: redundant creation of sgi_uv

[Ingo Molnar]

* Cliff Wickman <cpw@sgi.com> wrote:

> 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()

applied to tip/x86/uv, thanks Cliff!

> Diffed against 2.6.28-rc3

Seemed to have been diffed against tip/master, or with other patches 
pending. (this patch depends on other patches pending in tip/x86/uv 
for v2.6.29 merge)

	Ingo