lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uml: improve error messages

Browse Source 
These error messages are from check_sysemu(), not check_ptrace().

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
WANG Cong
2009-03-31 15:23:41 -07:00
committed by Linus Torvalds
parent dc71768742
commit 5062910a06
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/um/os-Linux/start_up.c
View File

@@ -244,7 +244,7 @@ static void __init check_sysemu(void)
if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0, if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0,
(void *) PTRACE_O_TRACESYSGOOD) < 0)) (void *) PTRACE_O_TRACESYSGOOD) < 0))
fatal_perror("check_ptrace: PTRACE_OLDSETOPTIONS failed"); fatal_perror("check_sysemu: PTRACE_OLDSETOPTIONS failed");
while (1) { while (1) {
count++; count++;
@@ -252,12 +252,12 @@ static void __init check_sysemu(void)
goto fail; goto fail;
CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
if (n < 0) if (n < 0)
fatal_perror("check_ptrace : wait failed"); fatal_perror("check_sysemu: wait failed");
if (WIFSTOPPED(status) && if (WIFSTOPPED(status) &&
(WSTOPSIG(status) == (SIGTRAP|0x80))) { (WSTOPSIG(status) == (SIGTRAP|0x80))) {
if (!count) { if (!count) {
non_fatal("check_ptrace : SYSEMU_SINGLESTEP " non_fatal("check_sysemu: SYSEMU_SINGLESTEP "
"doesn't singlestep"); "doesn't singlestep");
goto fail; goto fail;
} }
@@ -271,7 +271,7 @@ static void __init check_sysemu(void)
else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP))
count++; count++;
else { else {
non_fatal("check_ptrace : expected SIGTRAP or " non_fatal("check_sysemu: expected SIGTRAP or "
"(SIGTRAP | 0x80), got status = %d\n", "(SIGTRAP | 0x80), got status = %d\n",
status); status);
goto fail; goto fail;