]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | Subject: [PATCH] UV: redundant creation of sgi_uv |
2 | To: linux-kernel@vger.kernel.org | |
3 | Cc: mingo@elte.hu | |
4 | From: Cliff Wickman <cpw@sgi.com> | |
5 | Patch-mainline: 2.6.28? | |
6 | References: bnc#444799 | |
7 | ||
8 | There is a collision between two UV functions: | |
9 | both uv_ptc_init() and gru_proc_init() try to make /proc/sgi_uv | |
10 | ||
11 | So move it's creation to a single place: uv_system_init() | |
12 | ||
13 | Diffed against 2.6.28-rc3 | |
14 | ||
15 | Signed-off-by: Cliff Wickman <cpw@sgi.com> | |
16 | Acked-by: Jeff Mahoney <jeffm@suse.com> | |
17 | --- | |
18 | arch/x86/kernel/genx2apic_uv_x.c | 2 ++ | |
19 | arch/x86/kernel/tlb_uv.c | 4 ---- | |
20 | 2 files changed, 2 insertions(+), 4 deletions(-) | |
21 | ||
22 | --- a/arch/x86/kernel/genx2apic_uv_x.c | |
23 | +++ b/arch/x86/kernel/genx2apic_uv_x.c | |
24 | @@ -20,6 +20,7 @@ | |
25 | #include <linux/module.h> | |
26 | #include <linux/hardirq.h> | |
27 | #include <linux/timer.h> | |
28 | +#include <linux/proc_fs.h> | |
29 | #include <asm/current.h> | |
30 | #include <asm/smp.h> | |
31 | #include <asm/ipi.h> | |
32 | @@ -577,5 +578,6 @@ void __init uv_system_init(void) | |
33 | uv_scir_register_cpu_notifier(); | |
34 | ||
35 | uv_cpu_init(); | |
36 | + proc_mkdir("sgi_uv", NULL); | |
37 | } | |
38 | ||
39 | --- a/arch/x86/kernel/tlb_uv.c | |
40 | +++ b/arch/x86/kernel/tlb_uv.c | |
41 | @@ -566,14 +566,10 @@ static int __init uv_ptc_init(void) | |
42 | if (!is_uv_system()) | |
43 | return 0; | |
44 | ||
45 | - if (!proc_mkdir("sgi_uv", NULL)) | |
46 | - return -EINVAL; | |
47 | - | |
48 | proc_uv_ptc = create_proc_entry(UV_PTC_BASENAME, 0444, NULL); | |
49 | if (!proc_uv_ptc) { | |
50 | printk(KERN_ERR "unable to create %s proc entry\n", | |
51 | UV_PTC_BASENAME); | |
52 | - remove_proc_entry("sgi_uv", NULL); | |
53 | return -EINVAL; | |
54 | } | |
55 | proc_uv_ptc->proc_fops = &proc_uv_ptc_operations; |