diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2009-03-31 18:23:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:16 -0400 |
commit | 5062910a06ee979002edbf58ab65481c81242df4 (patch) | |
tree | b3c961d2fc0058d400cf78617d11714af19d1180 | |
parent | dc71768742b39bca298e9ca6c91e575cd4b140e6 (diff) |
uml: improve error messages
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>
-rw-r--r-- | arch/um/os-Linux/start_up.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index 183db26d01bf..02ee9adff54a 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
@@ -244,7 +244,7 @@ static void __init check_sysemu(void) | |||
244 | 244 | ||
245 | if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0, | 245 | if ((ptrace(PTRACE_OLDSETOPTIONS, pid, 0, |
246 | (void *) PTRACE_O_TRACESYSGOOD) < 0)) | 246 | (void *) PTRACE_O_TRACESYSGOOD) < 0)) |
247 | fatal_perror("check_ptrace: PTRACE_OLDSETOPTIONS failed"); | 247 | fatal_perror("check_sysemu: PTRACE_OLDSETOPTIONS failed"); |
248 | 248 | ||
249 | while (1) { | 249 | while (1) { |
250 | count++; | 250 | count++; |
@@ -252,12 +252,12 @@ static void __init check_sysemu(void) | |||
252 | goto fail; | 252 | goto fail; |
253 | CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); | 253 | CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED)); |
254 | if (n < 0) | 254 | if (n < 0) |
255 | fatal_perror("check_ptrace : wait failed"); | 255 | fatal_perror("check_sysemu: wait failed"); |
256 | 256 | ||
257 | if (WIFSTOPPED(status) && | 257 | if (WIFSTOPPED(status) && |
258 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { | 258 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { |
259 | if (!count) { | 259 | if (!count) { |
260 | non_fatal("check_ptrace : SYSEMU_SINGLESTEP " | 260 | non_fatal("check_sysemu: SYSEMU_SINGLESTEP " |
261 | "doesn't singlestep"); | 261 | "doesn't singlestep"); |
262 | goto fail; | 262 | goto fail; |
263 | } | 263 | } |
@@ -271,7 +271,7 @@ static void __init check_sysemu(void) | |||
271 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) | 271 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) |
272 | count++; | 272 | count++; |
273 | else { | 273 | else { |
274 | non_fatal("check_ptrace : expected SIGTRAP or " | 274 | non_fatal("check_sysemu: expected SIGTRAP or " |
275 | "(SIGTRAP | 0x80), got status = %d\n", | 275 | "(SIGTRAP | 0x80), got status = %d\n", |
276 | status); | 276 | status); |
277 | goto fail; | 277 | goto fail; |