diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /fs/proc/internal.h | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
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, |