diff options
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 6b96892015ec..4e8aa35fc3eb 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -376,22 +376,6 @@ static const struct file_operations proc_lstats_operations = { | |||
376 | 376 | ||
377 | #endif | 377 | #endif |
378 | 378 | ||
379 | #ifdef CONFIG_PROC_PID_CPUSET | ||
380 | |||
381 | static int cpuset_open(struct inode *inode, struct file *file) | ||
382 | { | ||
383 | struct pid *pid = PROC_I(inode)->pid; | ||
384 | return single_open(file, proc_cpuset_show, pid); | ||
385 | } | ||
386 | |||
387 | static const struct file_operations proc_cpuset_operations = { | ||
388 | .open = cpuset_open, | ||
389 | .read = seq_read, | ||
390 | .llseek = seq_lseek, | ||
391 | .release = single_release, | ||
392 | }; | ||
393 | #endif | ||
394 | |||
395 | static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns, | 379 | static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns, |
396 | struct pid *pid, struct task_struct *task) | 380 | struct pid *pid, struct task_struct *task) |
397 | { | 381 | { |
@@ -2558,7 +2542,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
2558 | REG("latency", S_IRUGO, proc_lstats_operations), | 2542 | REG("latency", S_IRUGO, proc_lstats_operations), |
2559 | #endif | 2543 | #endif |
2560 | #ifdef CONFIG_PROC_PID_CPUSET | 2544 | #ifdef CONFIG_PROC_PID_CPUSET |
2561 | REG("cpuset", S_IRUGO, proc_cpuset_operations), | 2545 | ONE("cpuset", S_IRUGO, proc_cpuset_show), |
2562 | #endif | 2546 | #endif |
2563 | #ifdef CONFIG_CGROUPS | 2547 | #ifdef CONFIG_CGROUPS |
2564 | ONE("cgroup", S_IRUGO, proc_cgroup_show), | 2548 | ONE("cgroup", S_IRUGO, proc_cgroup_show), |
@@ -2904,7 +2888,7 @@ static const struct pid_entry tid_base_stuff[] = { | |||
2904 | REG("latency", S_IRUGO, proc_lstats_operations), | 2888 | REG("latency", S_IRUGO, proc_lstats_operations), |
2905 | #endif | 2889 | #endif |
2906 | #ifdef CONFIG_PROC_PID_CPUSET | 2890 | #ifdef CONFIG_PROC_PID_CPUSET |
2907 | REG("cpuset", S_IRUGO, proc_cpuset_operations), | 2891 | ONE("cpuset", S_IRUGO, proc_cpuset_show), |
2908 | #endif | 2892 | #endif |
2909 | #ifdef CONFIG_CGROUPS | 2893 | #ifdef CONFIG_CGROUPS |
2910 | ONE("cgroup", S_IRUGO, proc_cgroup_show), | 2894 | ONE("cgroup", S_IRUGO, proc_cgroup_show), |