Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker

Conflicts:
	sysdeps/mach/hurd/i386/init-first.c
	sysdeps/unix/sysv/linux/ldsodefs.h

5 files changed, 36 insertions, 36 deletions

diff --git a/mach/err_boot.sub b/mach/err_boot.sub
index 5393ab1335..feba8fcd6f 100644
--- a/mach/err_boot.sub
+++ b/mach/err_boot.sub
@@ -1,26 +1,26 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
@@ -32,7 +32,7 @@
  * Revision 2.2  92/04/01  19:37:59  rpd
  * 	Created.
  * 	[92/03/09            rpd]
- * 
+ *
  */
 /*
  *	File:	err_bootstrap.sub
diff --git a/mach/err_ipc.sub b/mach/err_ipc.sub
index 1de186e2e7..3acabd847c 100644
--- a/mach/err_ipc.sub
+++ b/mach/err_ipc.sub
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
@@ -31,11 +31,11 @@
  *
  * Revision 2.2  92/01/16  00:08:40  rpd
  * 	Moved from user collection to mk collection.
- * 
+ *
  * Revision 2.2  91/03/27  16:05:16  mrt
  * 	First checkin
- * 
- * 
+ *
+ *
  */
 /*
  *	File:	err_ipc.sub
@@ -52,7 +52,7 @@ static char * err_codes_send[] = {
 	"(ipc/send) timed out",			/* -103 */
 	"(ipc/send) unused error",		/* -104 */
 	"(ipc/send) will notify",		/* -105 */
-	"(ipc/send) notify in progress",	/* -106 */	
+	"(ipc/send) notify in progress",	/* -106 */
 	"(ipc/send) kernel refused message",	/* -107 */
 	"(ipc/send) send interrupted",		/* -108 */
 	"(ipc/send) send message too large",	/* -109 */
diff --git a/mach/err_mach.sub b/mach/err_mach.sub
index b33522c344..708047150e 100644
--- a/mach/err_mach.sub
+++ b/mach/err_mach.sub
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
@@ -32,21 +32,21 @@
  * Revision 2.3  92/04/01  19:38:05  rpd
  * 	Added MIG_DESTROY_REQUEST.
  * 	[92/03/09            rpd]
- * 
+ *
  * Revision 2.2  92/01/16  00:09:05  rpd
  * 	Moved from user collection to mk collection.
- * 
+ *
  * Revision 2.3  91/08/29  15:51:30  rpd
  * 	Added MIG_SERVER_DIED.
  * 	[91/08/21            rpd]
- * 
+ *
  * Revision 2.2  91/03/27  16:05:37  mrt
  * 	First checkin
- * 
+ *
  * Revision 2.2  91/03/18  17:39:03  rpd
  * 	Created.
  * 	[91/03/18            rpd]
- * 
+ *
  */
 /*
  *	File:	err_mach_ipc.sub
diff --git a/mach/msg-destroy.c b/mach/msg-destroy.c
index 19f96d4e21..aad7a7709f 100644
--- a/mach/msg-destroy.c
+++ b/mach/msg-destroy.c
@@ -75,10 +75,10 @@ __mach_msg_destroy(msg)
 	mach_msg_body_t		*body;
 	mach_msg_descriptor_t	*saddr, *eaddr;
 
-    	body = (mach_msg_body_t *) (msg + 1);
-    	saddr = (mach_msg_descriptor_t *)
+	body = (mach_msg_body_t *) (msg + 1);
+	saddr = (mach_msg_descriptor_t *)
 			((mach_msg_base_t *) msg + 1);
-    	eaddr =  saddr + body->msgh_descriptor_count;
+	eaddr =  saddr + body->msgh_descriptor_count;
 
 	for  ( ; saddr < eaddr; saddr++) {
 	    switch (saddr->type.type) {
diff --git a/mach/msgserver.c b/mach/msgserver.c
index fc34d71968..a77377b6d9 100644
--- a/mach/msgserver.c
+++ b/mach/msgserver.c
@@ -78,8 +78,8 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request,
 			   mach_msg_option_t option,
 			   mach_msg_timeout_t timeout)
 {
-  register mig_reply_header_t *request, *reply;
-  register mach_msg_return_t mr;
+  mig_reply_header_t *request, *reply;
+  mach_msg_return_t mr;
 
   if (max_size == 0)
     {