Part #2 merging back my changes ...

8 files changed, 9 insertions, 9 deletions

diff --git a/fs/dquot.c b/fs/dquot.c
index 731f2df7b..3b59ef828 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -13,7 +13,7 @@
  * diskquota system. This implementation is not based on any BSD
  * kernel sourcecode.
  * 
- * Version: $Id: dquot.c,v 1.4 1997/08/06 19:16:09 miguel Exp $
+ * Version: $Id: dquot.c,v 1.11 1997/01/06 06:53:02 davem Exp $
  * 
  * Author:  Marco van Wieringen <mvw@mcs.ow.nl> <mvw@tnix.net>
  * 
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index df045e1c4..3b06d4c36 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: nfsroot.c,v 1.5 1997/08/06 19:16:18 miguel Exp $
+ *  $Id: nfsroot.c,v 1.38 1997/07/17 03:21:06 davem Exp $
  *
  *  Copyright (C) 1995, 1996  Gero Kuhlmann <gero@gkminix.han.de>
  *
@@ -1254,7 +1254,7 @@ __initfunc(static void root_nfs_addrs(char *addrs))
 	system_utsname.domainname[0] = '\0';
 	user_dev_name[0] = '\0';
 	bootp_flag = rarp_flag = 1;
-	
+
 	/* The following is just a shortcut for automatic IP configuration */
 	if (!strcmp(addrs, "bootp")) {
 		rarp_flag = 0;
diff --git a/fs/proc/array.c b/fs/proc/array.c
index eac2db247..4415a7c54 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -472,7 +472,7 @@ static unsigned long get_wchan(struct task_struct *p)
 
 		pc = thread_saved_pc(&p->tss);
 		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
-			schedule_frame = ((unsigned long *)(long)p->tss.reg30)[15];
+			schedule_frame = ((unsigned long *)(long)p->tss.reg30)[16];
 			return (unsigned long)((unsigned long *)schedule_frame)[11];
 		}
 		return pc;
diff --git a/fs/ufs/ufs_dir.c b/fs/ufs/ufs_dir.c
index 7806c7d45..e91847df3 100644
--- a/fs/ufs/ufs_dir.c
+++ b/fs/ufs/ufs_dir.c
@@ -6,7 +6,7 @@
  * Laboratory for Computer Science Research Computing Facility
  * Rutgers, The State University of New Jersey
  *
- * $Id: ufs_dir.c,v 1.2 1997/06/17 13:27:28 ralf Exp $
+ * $Id: ufs_dir.c,v 1.10 1997/06/05 01:29:06 davem Exp $
  *
  */
 
diff --git a/fs/ufs/ufs_file.c b/fs/ufs/ufs_file.c
index ef7858c8f..72161d2bd 100644
--- a/fs/ufs/ufs_file.c
+++ b/fs/ufs/ufs_file.c
@@ -6,7 +6,7 @@
  * Laboratory for Computer Science Research Computing Facility
  * Rutgers, The State University of New Jersey
  *
- * $Id: ufs_file.c,v 1.2 1997/06/17 13:27:28 ralf Exp $
+ * $Id: ufs_file.c,v 1.9 1997/07/17 02:24:13 davem Exp $
  *
  */
 
diff --git a/fs/ufs/ufs_inode.c b/fs/ufs/ufs_inode.c
index d8c8c6896..c55092d54 100644
--- a/fs/ufs/ufs_inode.c
+++ b/fs/ufs/ufs_inode.c
@@ -6,7 +6,7 @@
  * Laboratory for Computer Science Research Computing Facility
  * Rutgers, The State University of New Jersey
  *
- * $Id: ufs_inode.c,v 1.2 1997/06/17 13:27:29 ralf Exp $
+ * $Id: ufs_inode.c,v 1.9 1997/07/17 02:24:14 davem Exp $
  *
  */
 
diff --git a/fs/ufs/ufs_namei.c b/fs/ufs/ufs_namei.c
index 4ae258738..ec9ec3119 100644
--- a/fs/ufs/ufs_namei.c
+++ b/fs/ufs/ufs_namei.c
@@ -6,7 +6,7 @@
  * Laboratory for Computer Science Research Computing Facility
  * Rutgers, The State University of New Jersey
  *
- * $Id: ufs_namei.c,v 1.2 1997/07/20 15:00:17 ralf Exp $
+ * $Id: ufs_namei.c,v 1.9 1997/07/22 06:40:12 davem Exp $
  *
  */
 
diff --git a/fs/ufs/ufs_super.c b/fs/ufs/ufs_super.c
index f08292a23..c2ee0ded7 100644
--- a/fs/ufs/ufs_super.c
+++ b/fs/ufs/ufs_super.c
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 1996  Eddie C. Dost  (ecd@skynet.be)
  *
- * $Id: ufs_super.c,v 1.2 1997/06/17 13:27:29 ralf Exp $
+ * $Id: ufs_super.c,v 1.25 1997/07/17 02:24:15 davem Exp $
  *
  */