diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cpuset.h | 9 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index ecae585ec3da..f8c9a2752f06 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h | |||
@@ -57,7 +57,9 @@ extern int cpuset_memory_pressure_enabled; | |||
57 | extern void __cpuset_memory_pressure_bump(void); | 57 | extern void __cpuset_memory_pressure_bump(void); |
58 | 58 | ||
59 | extern const struct file_operations proc_cpuset_operations; | 59 | extern const struct file_operations proc_cpuset_operations; |
60 | extern char *cpuset_task_status_allowed(struct task_struct *task, char *buffer); | 60 | struct seq_file; |
61 | extern void cpuset_task_status_allowed(struct seq_file *m, | ||
62 | struct task_struct *task); | ||
61 | 63 | ||
62 | extern void cpuset_lock(void); | 64 | extern void cpuset_lock(void); |
63 | extern void cpuset_unlock(void); | 65 | extern void cpuset_unlock(void); |
@@ -126,10 +128,9 @@ static inline int cpuset_mems_allowed_intersects(const struct task_struct *tsk1, | |||
126 | 128 | ||
127 | static inline void cpuset_memory_pressure_bump(void) {} | 129 | static inline void cpuset_memory_pressure_bump(void) {} |
128 | 130 | ||
129 | static inline char *cpuset_task_status_allowed(struct task_struct *task, | 131 | static inline void cpuset_task_status_allowed(struct seq_file *m, |
130 | char *buffer) | 132 | struct task_struct *task) |
131 | { | 133 | { |
132 | return buffer; | ||
133 | } | 134 | } |
134 | 135 | ||
135 | static inline void cpuset_lock(void) {} | 136 | static inline void cpuset_lock(void) {} |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index b04ebf09fb91..e4a8f9aef188 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -118,7 +118,8 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct | |||
118 | int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); | 118 | int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); |
119 | unsigned long task_vsize(struct mm_struct *); | 119 | unsigned long task_vsize(struct mm_struct *); |
120 | int task_statm(struct mm_struct *, int *, int *, int *, int *); | 120 | int task_statm(struct mm_struct *, int *, int *, int *, int *); |
121 | char *task_mem(struct mm_struct *, char *); | 121 | void task_mem(struct seq_file *, struct mm_struct *); |
122 | void clear_refs_smap(struct mm_struct *mm); | ||
122 | 123 | ||
123 | struct proc_dir_entry *de_get(struct proc_dir_entry *de); | 124 | struct proc_dir_entry *de_get(struct proc_dir_entry *de); |
124 | void de_put(struct proc_dir_entry *de); | 125 | void de_put(struct proc_dir_entry *de); |