Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Cliff Wickman 2008-11-10 16:16:31 -06:00 committed by Ingo Molnar
parent 7d9d1f25c3
commit a3d732f937
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/genx2apic_uv_x.c
View File

@ -20,6 +20,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/proc_fs.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/ipi.h> #include <asm/ipi.h>
@ -570,4 +571,5 @@ void __init uv_system_init(void)
uv_cpu_init(); uv_cpu_init();
uv_scir_register_cpu_notifier(); uv_scir_register_cpu_notifier();
proc_mkdir("sgi_uv", NULL);
} }

4
arch/x86/kernel/tlb_uv.c
View File

@ -566,14 +566,10 @@ static int __init uv_ptc_init(void)
if (!is_uv_system()) if (!is_uv_system())
return 0; return 0;
if (!proc_mkdir("sgi_uv", NULL))
return -EINVAL;
proc_uv_ptc = create_proc_entry(UV_PTC_BASENAME, 0444, NULL); proc_uv_ptc = create_proc_entry(UV_PTC_BASENAME, 0444, NULL);
if (!proc_uv_ptc) { if (!proc_uv_ptc) {
printk(KERN_ERR "unable to create %s proc entry\n", printk(KERN_ERR "unable to create %s proc entry\n",
UV_PTC_BASENAME); UV_PTC_BASENAME);
remove_proc_entry("sgi_uv", NULL);
return -EINVAL; return -EINVAL;
} }
proc_uv_ptc->proc_fops = &proc_uv_ptc_operations; proc_uv_ptc->proc_fops = &proc_uv_ptc_operations;

1
drivers/misc/sgi-gru/gruprocfs.c
View File

@ -317,7 +317,6 @@ int gru_proc_init(void)
{ {
struct proc_entry *p; struct proc_entry *p;
proc_mkdir("sgi_uv", NULL);
proc_gru = proc_mkdir("sgi_uv/gru", NULL); proc_gru = proc_mkdir("sgi_uv/gru", NULL);
for (p = proc_files; p->name; p++) for (p = proc_files; p->name; p++)