Merge commit 'origin/master' into maemo-test

[qemu] / linux-user / main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index 9e46005..724387a 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2214,7 +2214,7 @@ static void usage(void)
            interp_prefix,
            x86_stack_size,
            DEBUG_LOGFILE);
-    _exit(1);
+    exit(1);
 }
 
 THREAD CPUState *thread_env;
@@ -2348,7 +2348,7 @@ int main(int argc, char **argv, char **envp)
 #if defined(cpu_list)
                     cpu_list(stdout, &fprintf);
 #endif
-                _exit(1);
+                exit(1);
             }
         } else if (!strcmp(r, "drop-ld-preload")) {
             drop_ld_preload = 1;