Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't

have a MIPS box at hand.

7 files changed, 12 insertions, 9 deletions

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index cd488e328..8a5286fa5 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -9,7 +9,7 @@
 
 O_TARGET := proc.o
 O_OBJS   := inode.o root.o base.o generic.o mem.o link.o fd.o array.o \
-		kmsg.o scsi.o proc_tty.o
+		kmsg.o scsi.o proc_tty.o sysvipc.o
 ifdef CONFIG_OMIRR
 O_OBJS   := $(O_OBJS) omirr.o
 endif
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 1ce95cdb4..1bc76ff2f 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -582,7 +582,7 @@ static unsigned long get_wchan(struct task_struct *p)
 			}
 		} while (count++ < 16);
 	}
-#elif defined (CONFIG_ARM)
+#elif defined(__arm__)
 	{
 		unsigned long fp, lr;
 		unsigned long stack_page;
@@ -639,7 +639,7 @@ static unsigned long get_wchan(struct task_struct *p)
 # define KSTK_EIP(tsk) \
     (*(unsigned long *)(PT_REG(pc) + PAGE_SIZE + (unsigned long)(tsk)))
 # define KSTK_ESP(tsk)	((tsk) == current ? rdusp() : (tsk)->tss.usp)
-#elif defined(CONFIG_ARM)
+#elif defined(__arm__)
 # define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
 # define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1020])
 #elif defined(__mc68000__)
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 44c4916f8..970e63a96 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -319,7 +319,7 @@ struct super_block *proc_read_super(struct super_block *s,void *data,
 	root_inode = proc_get_inode(s, PROC_ROOT_INO, &proc_root);
 	if (!root_inode)
 		goto out_no_root;
-	s->s_root = d_alloc_root(root_inode, NULL);
+	s->s_root = d_alloc_root(root_inode);
 	if (!s->s_root)
 		goto out_no_root;
 	parse_options(data, &root_inode->i_uid, &root_inode->i_gid);
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index 71c5316a9..ba78768b6 100644
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 
 extern unsigned long log_size;
-extern struct wait_queue * log_wait;
+extern wait_queue_head_t log_wait;
 
 extern int do_syslog(int type, char * bug, int count);
 
diff --git a/fs/proc/link.c b/fs/proc/link.c
index b12050767..9df4de674 100644
--- a/fs/proc/link.c
+++ b/fs/proc/link.c
@@ -146,7 +146,7 @@ static int do_proc_readlink(struct dentry *dentry, char * buffer, int buflen)
 	/* Check for special dentries.. */
 	pattern = NULL;
 	inode = dentry->d_inode;
-	if (inode && dentry->d_parent == dentry) {
+	if (inode && IS_ROOT(dentry)) {
 		if (S_ISSOCK(inode->i_mode))
 			pattern = "socket:[%lu]";
 		if (S_ISFIFO(inode->i_mode))
diff --git a/fs/proc/omirr.c b/fs/proc/omirr.c
index 9bde82e82..dbf2b32b9 100644
--- a/fs/proc/omirr.c
+++ b/fs/proc/omirr.c
@@ -16,8 +16,8 @@ static int cleared_flag = 0;
 static char * buffer = NULL;
 static int read_pos, write_pos;
 static int clip_pos, max_pos;
-static struct wait_queue * read_wait = NULL;
-static struct wait_queue * write_wait = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(read_wait);
+static DECLARE_WAIT_QUEUE_HEAD(write_wait);
 
 static /*inline*/ int reserve_write_space(int len)
 {
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 82b3fd71d..f6a775359 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -155,7 +155,7 @@ struct proc_dir_entry proc_root = {
 	&proc_root, NULL
 };
 
-struct proc_dir_entry *proc_net, *proc_scsi, *proc_bus;
+struct proc_dir_entry *proc_net, *proc_scsi, *proc_bus, *proc_sysvipc;
 
 #ifdef CONFIG_MCA
 struct proc_dir_entry proc_mca = {
@@ -688,6 +688,9 @@ __initfunc(void proc_root_init(void))
 	proc_register(&proc_root, &proc_root_self);
 	proc_net = create_proc_entry("net", S_IFDIR, 0);
 	proc_scsi = create_proc_entry("scsi", S_IFDIR, 0);
+#ifdef CONFIG_SYSVIPC
+	proc_sysvipc = create_proc_entry("sysvipc", S_IFDIR, 0);
+#endif
 #ifdef CONFIG_SYSCTL
 	proc_register(&proc_root, &proc_sys_root);
 #endif