This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / kernel / main.c

diff --git a/arch/um/kernel/main.c b/arch/um/kernel/main.c
index 3011804..e1fd2c5 100644 (file)
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
@@ -17,16 +17,11 @@
 #include "kern_util.h"
 #include "mem_user.h"
 #include "signal_user.h"
-#include "time_user.h"
-#include "irq_user.h"
 #include "user.h"
 #include "init.h"
 #include "mode.h"
 #include "choose-mode.h"
 #include "uml-config.h"
-#include "irq_user.h"
-#include "time_user.h"
-#include "os.h"
 
 /* Set in set_stklim, which is called from main and __wrap_malloc.
  * __wrap_malloc only calls it if main hasn't started.
@@ -176,7 +171,7 @@ int main(int argc, char **argv, char **envp)
 }
 
 #define CAN_KMALLOC() \
-       (kmalloc_ok && CHOOSE_MODE((os_getpid() != tracing_pid), 1))
+       (kmalloc_ok && CHOOSE_MODE((getpid() != tracing_pid), 1))
 
 extern void *__real_malloc(int);