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

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

6 files changed, 29 insertions, 29 deletions

diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h
index 4db186febd..6c6b6979d8 100644
--- a/hurd/hurd/ioctl.h
+++ b/hurd/hurd/ioctl.h
@@ -54,7 +54,7 @@ extern int hurd_register_ioctl_handler (int first_request, int last_request,
 
 #define	_HURD_HANDLE_IOCTLS_1(handler, first, last, moniker)		      \
   static const struct ioctl_handler handler##_ioctl_handler##moniker	      \
-  	__attribute__ ((__unused__)) =					      \
+	__attribute__ ((__unused__)) =					      \
     { _IOC_NOTYPE (first), _IOC_NOTYPE (last),				      \
 	(ioctl_handler_t) (handler), NULL };				      \
   text_set_element (_hurd_ioctl_handler_lists,				      \
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c
index 12da1f2abc..071abeb718 100644
--- a/hurd/hurdmalloc.c
+++ b/hurd/hurdmalloc.c
@@ -171,10 +171,10 @@ malloc_init (void)
 static void
 more_memory(int size, free_list_t fl)
 {
-	register int amount;
-	register int n;
+	int amount;
+	int n;
 	vm_address_t where;
-	register header_t h;
+	header_t h;
 	kern_return_t r;
 
 	if (size <= vm_page_size) {
@@ -203,11 +203,11 @@ more_memory(int size, free_list_t fl)
 /* Declaration changed to standard one for GNU.  */
 void *
 malloc(size)
-	register size_t size;
+	size_t size;
 {
-	register int i, n;
-	register free_list_t fl;
-	register header_t h;
+	int i, n;
+	free_list_t fl;
+	header_t h;
 
 	if ((int) size < 0)		/* sanity check */
 		return 0;
@@ -272,9 +272,9 @@ void
 free(base)
 	void *base;
 {
-	register header_t h;
-	register free_list_t fl;
-	register int i;
+	header_t h;
+	free_list_t fl;
+	int i;
 
 	if (base == 0)
 		return;
@@ -322,9 +322,9 @@ realloc(old_base, new_size)
         void *old_base;
         size_t new_size;
 {
-	register header_t h;
-	register free_list_t fl;
-	register int i;
+	header_t h;
+	free_list_t fl;
+	int i;
 	unsigned int old_size;
 	char *new_base;
 
@@ -380,17 +380,17 @@ realloc(old_base, new_size)
 
 #ifdef	DEBUG
 void
-print_malloc_free_list()
+print_malloc_free_list (void)
 {
-  	register int i, size;
-	register free_list_t fl;
-	register int n;
-  	register header_t h;
+	int i, size;
+	free_list_t fl;
+	int n;
+	header_t h;
 	int total_used = 0;
 	int total_free = 0;
 
 	fprintf(stderr, "      Size     In Use       Free      Total\n");
-  	for (i = 0, size = MIN_SIZE, fl = malloc_free_list;
+	for (i = 0, size = MIN_SIZE, fl = malloc_free_list;
 	     i < NBUCKETS;
 	     i += 1, size <<= 1, fl += 1) {
 		spin_lock(&fl->lock);
@@ -403,8 +403,8 @@ print_malloc_free_list()
 				size, fl->in_use, n, fl->in_use + n);
 		}
 		spin_unlock(&fl->lock);
-  	}
-  	fprintf(stderr, " all sizes %10d %10d %10d\n",
+	}
+	fprintf(stderr, " all sizes %10d %10d %10d\n",
 		total_used, total_free, total_used + total_free);
 }
 #endif	/* DEBUG */
@@ -416,7 +416,7 @@ malloc_fork_prepare(void)
  * malloc critical section.
  */
 {
-    register int i;
+    int i;
 
     for (i = 0; i < NBUCKETS; i++) {
 	spin_lock(&malloc_free_list[i].lock);
@@ -429,7 +429,7 @@ malloc_fork_parent(void)
  * Called in the parent process after a fork() to resume normal operation.
  */
 {
-    register int i;
+    int i;
 
     for (i = NBUCKETS-1; i >= 0; i--) {
 	spin_unlock(&malloc_free_list[i].lock);
@@ -442,7 +442,7 @@ malloc_fork_child(void)
  * Called in the child process after a fork() to resume normal operation.
  */
 {
-    register int i;
+    int i;
 
     for (i = NBUCKETS-1; i >= 0; i--) {
 	spin_unlock(&malloc_free_list[i].lock);
diff --git a/hurd/hurdmsg.c b/hurd/hurdmsg.c
index ec0b01df90..f916a3a35e 100644
--- a/hurd/hurdmsg.c
+++ b/hurd/hurdmsg.c
@@ -308,7 +308,7 @@ _S_msg_get_env_variable (mach_port_t msgport,
   valuelen = strlen (value);
   if (valuelen > *datalen)
     {
-      if (err = __vm_allocate (__mach_task_self (), 
+      if (err = __vm_allocate (__mach_task_self (),
 			       (vm_address_t *) data, valuelen, 1))
 	return err;
     }
diff --git a/hurd/new-fd.c b/hurd/new-fd.c
index e5220560a1..32c72522dd 100644
--- a/hurd/new-fd.c
+++ b/hurd/new-fd.c
@@ -32,7 +32,7 @@ _hurd_new_fd (io_t port, io_t ctty)
       /* Initialize the port cells.  */
       _hurd_port_init (&d->port, port);
       _hurd_port_init (&d->ctty, ctty);
-      
+
       /* And the fcntl flags.  */
       d->flags = 0;
     }
diff --git a/hurd/ports-get.c b/hurd/ports-get.c
index 7d6be6ed98..a4495a605e 100644
--- a/hurd/ports-get.c
+++ b/hurd/ports-get.c
@@ -37,7 +37,7 @@ _hurd_ports_get (unsigned int which, mach_port_t *result)
     return EINVAL;
   if (which >= INIT_PORT_MAX || _hurd_ports_getters[which] == NULL)
     return HURD_PORT_USE (&_hurd_ports[which],
-			  (*result = port) == MACH_PORT_NULL ? 0 
+			  (*result = port) == MACH_PORT_NULL ? 0
 			  : __mach_port_mod_refs (__mach_task_self (),
 						  port, MACH_PORT_RIGHT_SEND,
 						  +1));
diff --git a/hurd/xattr.c b/hurd/xattr.c
index 70e0990f43..f22cd59214 100644
--- a/hurd/xattr.c
+++ b/hurd/xattr.c
@@ -29,7 +29,7 @@
    gnu.author		empty if st_author==st_uid
 			uid_t giving st_author value
    gnu.translator	empty if no passive translator
-  			translator and arguments: "/hurd/foo\0arg1\0arg2\0"
+			translator and arguments: "/hurd/foo\0arg1\0arg2\0"
 */
 
 error_t