diff --git a/[refs] b/[refs] index 7c4b5478930a..3cc579e1c5ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f284ce7269031947326bac6bb19a977705276222 +refs/heads/master: 62239ac2b301abc397e70986649666cfb7835907 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index e68780810279..b3a9f0db9d80 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -283,6 +283,7 @@ extern int dir_notify_enable; #include #include #include +#include #include #include @@ -2050,5 +2051,9 @@ static inline void free_secdata(void *secdata) { } #endif /* CONFIG_SECURITY */ +int proc_nr_files(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos); + + #endif /* __KERNEL__ */ #endif /* _LINUX_FS_H */ diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 48dae075d5c2..7063ebc6db05 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -49,9 +50,6 @@ #include #include -extern int proc_nr_files(ctl_table *table, int write, struct file *filp, - void __user *buffer, size_t *lenp, loff_t *ppos); - #ifdef CONFIG_X86 #include #include