---

yaml --- r: 48389 b: refs/heads/master c: 77b14db h: refs/heads/master i: 48387: 140095c v: v3
git-mirror · Feb 14, 2007 · 4c1e305 · 4c1e305
1 parent 035e5a8
commit 4c1e305
Show file tree

Hide file tree

Showing 11 changed files with 487 additions and 200 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ff007eb8e8c7c44e9a384a67d0fdd0fd06ba811
+refs/heads/master: 77b14db502cb85a031fe8fde6c85d52f3e0acb63
diff --git a/trunk/fs/proc/Makefile b/trunk/fs/proc/Makefile
@@ -8,7 +8,7 @@ proc-y			:= nommu.o task_nommu.o
 proc-$(CONFIG_MMU)	:= mmu.o task_mmu.o
 
 proc-y       += inode.o root.o base.o generic.o array.o \
-		proc_tty.o proc_misc.o
+		proc_tty.o proc_misc.o proc_sysctl.o
 
 proc-$(CONFIG_PROC_KCORE)	+= kcore.o
 proc-$(CONFIG_PROC_VMCORE)	+= vmcore.o

diff --git a/trunk/fs/proc/generic.c b/trunk/fs/proc/generic.c
@@ -32,7 +32,7 @@ static loff_t proc_file_lseek(struct file *, loff_t, int);
 
 DEFINE_SPINLOCK(proc_subdir_lock);
 
-int proc_match(int len, const char *name, struct proc_dir_entry *de)
+static int proc_match(int len, const char *name, struct proc_dir_entry *de)
 {
 	if (de->namelen != len)
 		return 0;

diff --git a/trunk/fs/proc/inode.c b/trunk/fs/proc/inode.c
@@ -161,6 +161,7 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
 	if (!inode)
 		goto out_ino;
 
+	PROC_I(inode)->fd = 0;
 	PROC_I(inode)->pde = de;
 	if (de) {
 		if (de->mode) {

diff --git a/trunk/fs/proc/internal.h b/trunk/fs/proc/internal.h
@@ -11,6 +11,8 @@
 
 #include <linux/proc_fs.h>
 
+extern int proc_sys_init(void);
+
 struct vmalloc_info {
 	unsigned long	used;
 	unsigned long	largest_chunk;