diff --git a/[refs] b/[refs] index c414a70053e8..a884696c5e60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e584fbbd9fd4f0f10b8aafc9982df8d0b553e35 +refs/heads/master: 3835541dd481091c4dbf5ef83c08aed12e50fd61 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 7621db800a74..8418fcc0a6ab 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -2909,7 +2909,7 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) */ static const struct pid_entry tid_base_stuff[] = { DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), - DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fd_operations), + DIR("fdinfo", S_IRUSR|S_IXUSR, proc_fdinfo_inode_operations, proc_fdinfo_operations), REG("environ", S_IRUSR, proc_environ_operations), INF("auxv", S_IRUSR, proc_pid_auxv), ONE("status", S_IRUGO, proc_pid_status),