diff --git a/[refs] b/[refs] index 0fd299028384..f66117a9fe33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3158e9411a66fb98d495ac441c242264f31aaf3e +refs/heads/master: 22e6c1b39c648850438decd491f62d311800c7db diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h index 6b12b0f661b4..cb224cf653b1 100644 --- a/trunk/include/linux/proc_fs.h +++ b/trunk/include/linux/proc_fs.h @@ -56,7 +56,7 @@ struct proc_dir_entry { nlink_t nlink; uid_t uid; gid_t gid; - unsigned long size; + loff_t size; struct inode_operations * proc_iops; struct file_operations * proc_fops; get_info_t *get_info;