Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83171
b: refs/heads/master
c: ee56314
h: refs/heads/master
i:
  83169: d7ff008
  83167: b54e5e8
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 5, 2008
1 parent 9669be4 commit c43e89c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 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: acb2cf34cf624b9b3ab20c2c83543146128a4dad
refs/heads/master: ee56314b79039b669396ee04aac3e342cd2e5a1f
32 changes: 18 additions & 14 deletions trunk/arch/um/kernel/skas/clone.c
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
#include <sched.h>
/*
* Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL
*/

#include <signal.h>
#include <sys/mman.h>
#include <sys/time.h>
#include <sched.h>
#include <asm/unistd.h>
#include <sys/time.h>
#include "as-layout.h"
#include "kern_constants.h"
#include "ptrace_user.h"
#include "skas.h"
#include "stub-data.h"
#include "uml-config.h"
#include "sysdep/stub.h"
#include "kern_constants.h"

/* This is in a separate file because it needs to be compiled with any
/*
* This is in a separate file because it needs to be compiled with any
* extraneous gcc flags (-pg, -fprofile-arcs, -ftest-coverage) disabled
*
* Use UM_KERN_PAGE_SIZE instead of PAGE_SIZE because that calls getpagesize
Expand All @@ -26,25 +29,26 @@ stub_clone_handler(void)

err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
STUB_DATA + UM_KERN_PAGE_SIZE / 2 - sizeof(void *));
if(err != 0)
if (err != 0)
goto out;

err = stub_syscall4(__NR_ptrace, PTRACE_TRACEME, 0, 0, 0);
if(err)
if (err)
goto out;

err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
(long) &data->timer, 0);
if(err)
if (err)
goto out;

remap_stack(data->fd, data->offset);
goto done;

out:
/* save current result.
* Parent: pid;
* child: retcode of mmap already saved and it jumps around this
/*
* save current result.
* Parent: pid;
* child: retcode of mmap already saved and it jumps around this
* assignment
*/
data->err = err;
Expand Down

0 comments on commit c43e89c

Please sign in to comment.