Skip to content

Commit

Permalink
uml: clone.c tidying
Browse files Browse the repository at this point in the history
clone.c needed some style attention -
	updated copyright
	include trimming
	coding style

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 5, 2008
1 parent acb2cf3 commit ee56314
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions 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 ee56314

Please sign in to comment.