Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47475
b: refs/heads/master
c: 9eae9b1
h: refs/heads/master
i:
  47473: f03a0f8
  47471: db62f23
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 11, 2007
1 parent 0ea912a commit e27dac3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 7242a4005d1c496bc1140d56a0d898cde1b3e3f6
refs/heads/master: 9eae9b132cd2cebf98cc45550049d421302b9aba
12 changes: 6 additions & 6 deletions trunk/arch/um/os-Linux/start_up.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int start_ptraced_child(void **stack_out)
status);

*stack_out = stack;
return(pid);
return pid;
}

/* When testing for SYSEMU support, if it is one of the broken versions, we
Expand Down Expand Up @@ -182,7 +182,7 @@ __uml_setup("nosysemu", nosysemu_cmd_param,
static void __init check_sysemu(void)
{
void *stack;
int pid, n, status, count=0;
int pid, n, status, count=0;

printf("Checking syscall emulation patch for ptrace...");
sysemu_supported = 0;
Expand Down Expand Up @@ -418,7 +418,7 @@ static inline void check_skas3_proc_mm(void)
{
printf(" - /proc/mm...");
if (os_access("/proc/mm", OS_ACC_W_OK) < 0) {
proc_mm = 0;
proc_mm = 0;
printf("not found\n");
}
else {
Expand All @@ -445,7 +445,7 @@ int can_do_skas(void)
#else
int can_do_skas(void)
{
return(0);
return 0;
}
#endif

Expand Down Expand Up @@ -493,11 +493,11 @@ int __init parse_iomem(char *str, int *add)
iomem_regions = new;
iomem_size += new->size + UM_KERN_PAGE_SIZE;

return(0);
return 0;
out_close:
os_close_file(fd);
out:
return(1);
return 1;
}


Expand Down

0 comments on commit e27dac3

Please sign in to comment.