diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /fs/proc/internal.h | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'fs/proc/internal.h')
| -rw-r--r-- | fs/proc/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index ea496ffeabe7..1c81c8f1aeed 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
| @@ -48,7 +48,7 @@ extern int maps_protect; | |||
| 48 | 48 | ||
| 49 | extern void create_seq_entry(char *name, mode_t mode, | 49 | extern void create_seq_entry(char *name, mode_t mode, |
| 50 | const struct file_operations *f); | 50 | const struct file_operations *f); |
| 51 | extern int proc_exe_link(struct inode *, struct dentry **, struct vfsmount **); | 51 | extern int proc_exe_link(struct inode *, struct path *); |
| 52 | extern int proc_tid_stat(struct seq_file *m, struct pid_namespace *ns, | 52 | extern int proc_tid_stat(struct seq_file *m, struct pid_namespace *ns, |
| 53 | struct pid *pid, struct task_struct *task); | 53 | struct pid *pid, struct task_struct *task); |
| 54 | extern int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns, | 54 | extern int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns, |