Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 60761
b: refs/heads/master
c: 62239ac
h: refs/heads/master
i:
  60759: 283e574
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jul 17, 2007
1 parent 094bad7 commit 3a928fe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f284ce7269031947326bac6bb19a977705276222
refs/heads/master: 62239ac2b301abc397e70986649666cfb7835907
5 changes: 5 additions & 0 deletions trunk/include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ extern int dir_notify_enable;
#include <linux/init.h>
#include <linux/pid.h>
#include <linux/mutex.h>
#include <linux/sysctl.h>

#include <asm/atomic.h>
#include <asm/semaphore.h>
Expand Down Expand Up @@ -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 */
4 changes: 1 addition & 3 deletions trunk/kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <linux/utsname.h>
#include <linux/capability.h>
#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/kobject.h>
Expand All @@ -49,9 +50,6 @@
#include <asm/uaccess.h>
#include <asm/processor.h>

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 <asm/nmi.h>
#include <asm/stacktrace.h>
Expand Down

0 comments on commit 3a928fe

Please sign in to comment.