[PATCH] bcm43xx: workaround init_board vs. IRQ race

[karo-tx-linux.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 3e991c0c02e28938ed6bda497efd5e10424c806d..c232dc0774389378c9fc8130ac84fb4067835f43 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -18,7 +18,6 @@
  *  distribution for more details.
  */
 
-#include <linux/config.h>
 #include <linux/cpu.h>
 #include <linux/cpumask.h>
 #include <linux/cpuset.h>
@@ -50,7 +49,6 @@
 #include <linux/time.h>
 #include <linux/backing-dev.h>
 #include <linux/sort.h>
-#include <linux/task_ref.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -1065,7 +1063,7 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs, char *buf)
 }
 
 /*
- * Frequency meter - How fast is some event occuring?
+ * Frequency meter - How fast is some event occurring?
  *
  * These routines manage a digitally filtered, constant time based,
  * event frequency meter.  There are four routines:
@@ -2443,7 +2441,7 @@ void __cpuset_memory_pressure_bump(void)
  */
 static int proc_cpuset_show(struct seq_file *m, void *v)
 {
-       struct task_ref *tref;
+       struct pid *pid;
        struct task_struct *tsk;
        char *buf;
        int retval;
@@ -2454,8 +2452,8 @@ static int proc_cpuset_show(struct seq_file *m, void *v)
                goto out;
 
        retval = -ESRCH;
-       tref = m->private;
-       tsk = get_tref_task(tref);
+       pid = m->private;
+       tsk = get_pid_task(pid, PIDTYPE_PID);
        if (!tsk)
                goto out_free;
 
@@ -2478,8 +2476,8 @@ out:
 
 static int cpuset_open(struct inode *inode, struct file *file)
 {
-       struct task_ref *tref = PROC_I(inode)->tref;
-       return single_open(file, proc_cpuset_show, tref);
+       struct pid *pid = PROC_I(inode)->pid;
+       return single_open(file, proc_cpuset_show, pid);
 }
 
 struct file_operations proc_cpuset_operations = {