Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 94075
b: refs/heads/master
c: 626c59f
h: refs/heads/master
i:
  94073: 1cd4c91
  94071: 24fc26b
v: v3
  • Loading branch information
WANG Cong authored and Linus Torvalds committed Apr 28, 2008
1 parent 13c9d2f commit a0033e1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3595726ac349ca9682703535e9a999c4f08c2d80
refs/heads/master: 626c59f5edb284027bfe25cc15e7de2f532090b5
14 changes: 6 additions & 8 deletions trunk/arch/um/os-Linux/start_up.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
#include "registers.h"
#include "skas_ptrace.h"

static int ptrace_child(void)
static void 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) {
if (change_sig(SIGWINCH, 0) < 0 ||
ptrace(PTRACE_TRACEME, 0, 0, 0) < 0) {
perror("ptrace");
kill(pid, SIGKILL);
}
Expand Down Expand Up @@ -75,9 +75,8 @@ static void fatal(char *fmt, ...)
va_list list;

va_start(list, fmt);
vprintf(fmt, list);
vfprintf(stderr, fmt, list);
va_end(list);
fflush(stdout);

exit(1);
}
Expand All @@ -87,9 +86,8 @@ static void non_fatal(char *fmt, ...)
va_list list;

va_start(list, fmt);
vprintf(fmt, list);
vfprintf(stderr, fmt, list);
va_end(list);
fflush(stdout);
}

static int start_ptraced_child(void)
Expand Down Expand Up @@ -495,7 +493,7 @@ int __init parse_iomem(char *str, int *add)
driver = str;
file = strchr(str,',');
if (file == NULL) {
printf("parse_iomem : failed to parse iomem\n");
fprintf(stderr, "parse_iomem : failed to parse iomem\n");
goto out;
}
*file = '\0';
Expand Down

0 comments on commit a0033e1

Please sign in to comment.