1 files changed, 41 insertions, 39 deletions

diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index aeeecc634733..1518f7a45a24 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -1,27 +1,21 @@
 /*
- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <signal.h>
+#include <unistd.h>
 #include <errno.h>
+#include <signal.h>
+#include <string.h>
 #include <sys/resource.h>
-#include <sys/mman.h>
-#include <sys/user.h>
-#include "kern_util.h"
 #include "as-layout.h"
-#include "mem_user.h"
-#include "irq_user.h"
-#include "user.h"
 #include "init.h"
-#include "uml-config.h"
+#include "kern_constants.h"
+#include "kern_util.h"
 #include "os.h"
 #include "um_malloc.h"
-#include "kern_constants.h"
 
 #define PGD_BOUND (4 * 1024 * 1024)
 #define STACKSIZE (8 * 1024 * 1024)
@@ -31,13 +25,13 @@ static void set_stklim(void)
 {
         struct rlimit lim;
 
-        if(getrlimit(RLIMIT_STACK, &lim) < 0){
+        if (getrlimit(RLIMIT_STACK, &lim) < 0) {
                 perror("getrlimit");
                 exit(1);
         }
-        if((lim.rlim_cur == RLIM_INFINITY) || (lim.rlim_cur > STACKSIZE)){
+        if ((lim.rlim_cur == RLIM_INFINITY) || (lim.rlim_cur > STACKSIZE)) {
                 lim.rlim_cur = STACKSIZE;
-                if(setrlimit(RLIMIT_STACK, &lim) < 0){
+                if (setrlimit(RLIMIT_STACK, &lim) < 0) {
                         perror("setrlimit");
                         exit(1);
                 }
@@ -49,7 +43,7 @@ static __init void do_uml_initcalls(void)
         initcall_t *call;
 
         call = &__uml_initcall_start;
-        while (call < &__uml_initcall_end){
+        while (call < &__uml_initcall_end) {
                 (*call)();
                 call++;
         }
@@ -68,7 +62,8 @@ static void install_fatal_handler(int sig)
         /* All signals are enabled in this handler ... */
         sigemptyset(&action.sa_mask);
 
-        /* ... including the signal being handled, plus we want the
+        /*
+         * ... including the signal being handled, plus we want the
          * handler reset to the default behavior, so that if an exit
          * handler is hanging for some reason, the UML will just die
          * after this signal is sent a second time.
@@ -76,7 +71,7 @@ static void install_fatal_handler(int sig)
         action.sa_flags = SA_RESETHAND | SA_NODEFER;
         action.sa_restorer = NULL;
         action.sa_handler = last_ditch_exit;
-        if(sigaction(sig, &action, NULL) < 0){
+        if (sigaction(sig, &action, NULL) < 0) {
                 printf("failed to install handler for signal %d - errno = %d\n",
                        errno);
                 exit(1);
@@ -92,7 +87,8 @@ static void setup_env_path(void)
         int path_len = 0;
 
         old_path = getenv("PATH");
-        /* if no PATH variable is set or it has an empty value
+        /*
+         * if no PATH variable is set or it has an empty value
          * just use the default + /usr/lib/uml
          */
         if (!old_path || (path_len = strlen(old_path)) == 0) {
@@ -125,38 +121,41 @@ int __init main(int argc, char **argv, char **envp)
         setup_env_path();
 
         new_argv = malloc((argc + 1) * sizeof(char *));
-        if(new_argv == NULL){
+        if (new_argv == NULL) {
                 perror("Mallocing argv");
                 exit(1);
         }
-        for(i=0;i<argc;i++){
+        for (i = 0; i < argc; i++) {
                 new_argv[i] = strdup(argv[i]);
-                if(new_argv[i] == NULL){
+                if (new_argv[i] == NULL) {
                         perror("Mallocing an arg");
                         exit(1);
                 }
         }
         new_argv[argc] = NULL;
 
-        /* Allow these signals to bring down a UML if all other
+        /*
+         * Allow these signals to bring down a UML if all other
          * methods of control fail.
          */
         install_fatal_handler(SIGINT);
         install_fatal_handler(SIGTERM);
         install_fatal_handler(SIGHUP);
 
-        scan_elf_aux( envp);
+        scan_elf_aux(envp);
 
         do_uml_initcalls();
         ret = linux_main(argc, argv);
 
-        /* Disable SIGPROF - I have no idea why libc doesn't do this or turn
+        /*
+         * Disable SIGPROF - I have no idea why libc doesn't do this or turn
          * off the profiling time, but UML dies with a SIGPROF just before
          * exiting when profiling is active.
          */
         change_sig(SIGPROF, 0);
 
-        /* This signal stuff used to be in the reboot case.  However,
+        /*
+         * This signal stuff used to be in the reboot case.  However,
          * sometimes a SIGVTALRM can come in when we're halting (reproducably
          * when writing out gcov information, presumably because that takes
          * some time) and cause a segfault.
@@ -167,17 +166,18 @@ int __init main(int argc, char **argv, char **envp)
 
         /* disable SIGIO for the fds and set SIGIO to be ignored */
         err = deactivate_all_fds();
-        if(err)
+        if (err)
                 printf("deactivate_all_fds failed, errno = %d\n", -err);
 
-        /* Let any pending signals fire now.  This ensures
+        /*
+         * Let any pending signals fire now.  This ensures
          * that they won't be delivered after the exec, when
          * they are definitely not expected.
          */
         unblock_signals();
 
         /* Reboot */
-        if(ret){
+        if (ret) {
                 printf("\n");
                 execvp(new_argv[0], new_argv);
                 perror("Failed to exec kernel");
@@ -193,17 +193,18 @@ void *__wrap_malloc(int size)
 {
         void *ret;
 
-        if(!kmalloc_ok)
+        if (!kmalloc_ok)
                 return __real_malloc(size);
-        else if(size <= UM_KERN_PAGE_SIZE)
+        else if (size <= UM_KERN_PAGE_SIZE)
                 /* finding contiguous pages can be hard*/
                 ret = kmalloc(size, UM_GFP_KERNEL);
         else ret = vmalloc(size);
 
-        /* glibc people insist that if malloc fails, errno should be
+        /*
+         * glibc people insist that if malloc fails, errno should be
          * set by malloc as well. So we do.
          */
-        if(ret == NULL)
+        if (ret == NULL)
                 errno = ENOMEM;
 
         return ret;
@@ -213,7 +214,7 @@ void *__wrap_calloc(int n, int size)
 {
         void *ptr = __wrap_malloc(n * size);
 
-        if(ptr == NULL)
+        if (ptr == NULL)
                 return NULL;
         memset(ptr, 0, n * size);
         return ptr;
@@ -227,7 +228,8 @@ void __wrap_free(void *ptr)
 {
         unsigned long addr = (unsigned long) ptr;
 
-        /* We need to know how the allocation happened, so it can be correctly
+        /*
+         * We need to know how the allocation happened, so it can be correctly
          * freed.  This is done by seeing what region of memory the pointer is
          * in -
          *      physical memory - kmalloc/kfree
@@ -245,12 +247,12 @@ void __wrap_free(void *ptr)
          * there is a possibility for memory leaks.
          */
 
-        if((addr >= uml_physmem) && (addr < high_physmem)){
-                if(kmalloc_ok)
+        if ((addr >= uml_physmem) && (addr < high_physmem)) {
+                if (kmalloc_ok)
                         kfree(ptr);
         }
-        else if((addr >= start_vm) && (addr < end_vm)){
-                if(kmalloc_ok)
+        else if ((addr >= start_vm) && (addr < end_vm)) {
+                if (kmalloc_ok)
                         vfree(ptr);
         }
         else __real_free(ptr);