x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / um / os-Linux / start_up.c

diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index c5c36dbe819b3f9163dc61ff56450b6d134fda59..7b81f6c08a5eddda2aaab95ac4df4f5fd729f88a 100644 (file)
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -28,13 +28,14 @@
 static int ptrace_child(void)
 {
        int ret;
+       /* Calling os_getpid because some libcs cached getpid incorrectly */
        int pid = os_getpid(), ppid = getppid();
        int sc_result;
 
        change_sig(SIGWINCH, 0);
        if (ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
                perror("ptrace");
-               os_kill_process(pid, 0);
+               kill(pid, SIGKILL);
        }
        kill(pid, SIGSTOP);
 
@@ -496,7 +497,7 @@ int __init parse_iomem(char *str, int *add)
        file++;
        fd = open(file, O_RDWR, 0);
        if (fd < 0) {
-               os_print_error(fd, "parse_iomem - Couldn't open io file");
+               perror("parse_iomem - Couldn't open io file");
                goto out;
        }