From 08523a249bf0056511db94703fe6b276ffae29c2 Mon Sep 17 00:00:00 2001
From: Cliff Wickman <cpw@sgi.com>
Date: Mon, 10 Nov 2008 16:16:31 -0600
Subject: [PATCH] --- yaml --- r: 120977 b: refs/heads/master c:
 a3d732f93785da17e0137210deadb4616f5536fc h: refs/heads/master i:   120975:
 486e08a91474358e9056d547d90123447124a499 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/genx2apic_uv_x.c | 2 ++
 trunk/arch/x86/kernel/tlb_uv.c         | 4 ----
 trunk/drivers/misc/sgi-gru/gruprocfs.c | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 519db709f4ad..366924d6e9f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d9d1f25c3872080ce599e5dd0dac3305d0a028b
+refs/heads/master: a3d732f93785da17e0137210deadb4616f5536fc
diff --git a/trunk/arch/x86/kernel/genx2apic_uv_x.c b/trunk/arch/x86/kernel/genx2apic_uv_x.c
index 85fb7dd48f67..d7213a1cb784 100644
--- a/trunk/arch/x86/kernel/genx2apic_uv_x.c
+++ b/trunk/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);
 }
diff --git a/trunk/arch/x86/kernel/tlb_uv.c b/trunk/arch/x86/kernel/tlb_uv.c
index 04431f34fd16..6a00e5faaa74 100644
--- a/trunk/arch/x86/kernel/tlb_uv.c
+++ b/trunk/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;
diff --git a/trunk/drivers/misc/sgi-gru/gruprocfs.c b/trunk/drivers/misc/sgi-gru/gruprocfs.c
index 533923f83f1a..73b0ca061bb5 100644
--- a/trunk/drivers/misc/sgi-gru/gruprocfs.c
+++ b/trunk/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++)