diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/net_kern.c | 2 | ||||
-rw-r--r-- | arch/um/include/shared/ptrace_user.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index f114813ae258..a74245ae3a84 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out, | |||
533 | char **error_out) | 533 | char **error_out) |
534 | { | 534 | { |
535 | char *end; | 535 | char *end; |
536 | int n, err = -EINVAL;; | 536 | int n, err = -EINVAL; |
537 | 537 | ||
538 | n = simple_strtoul(str, &end, 0); | 538 | n = simple_strtoul(str, &end, 0); |
539 | if (end == str) { | 539 | if (end == str) { |
diff --git a/arch/um/include/shared/ptrace_user.h b/arch/um/include/shared/ptrace_user.h index 4bce6e012889..7fd8539bc19a 100644 --- a/arch/um/include/shared/ptrace_user.h +++ b/arch/um/include/shared/ptrace_user.h | |||
@@ -29,7 +29,7 @@ extern int ptrace_setregs(long pid, unsigned long *regs_in); | |||
29 | * recompilation. So, we use PTRACE_OLDSETOPTIONS in UML. | 29 | * recompilation. So, we use PTRACE_OLDSETOPTIONS in UML. |
30 | * We also want to be able to build the kernel on 2.4, which doesn't | 30 | * We also want to be able to build the kernel on 2.4, which doesn't |
31 | * have PTRACE_OLDSETOPTIONS. So, if it is missing, we declare | 31 | * have PTRACE_OLDSETOPTIONS. So, if it is missing, we declare |
32 | * PTRACE_OLDSETOPTIONS to to be the same as PTRACE_SETOPTIONS. | 32 | * PTRACE_OLDSETOPTIONS to be the same as PTRACE_SETOPTIONS. |
33 | * | 33 | * |
34 | * On architectures, that start to support PTRACE_O_TRACESYSGOOD on | 34 | * On architectures, that start to support PTRACE_O_TRACESYSGOOD on |
35 | * linux 2.6, PTRACE_OLDSETOPTIONS never is defined, and also isn't | 35 | * linux 2.6, PTRACE_OLDSETOPTIONS never is defined, and also isn't |