Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff64b4c1 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of uml unistd.h 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 6a0eec82

arch/um/include/asm/unistd.h

deleted100644 → 0
+0 −41
Original line number Original line Diff line number Diff line 
/* 

 * Copyright (C) 2000 - 2004  Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef _UM_UNISTD_H_

#define _UM_UNISTD_H_



#include <linux/syscalls.h>

#include "linux/resource.h"

#include "asm/uaccess.h"



extern int um_execve(const char *file, char *const argv[], char *const env[]);



#ifdef __KERNEL__

/* We get __ARCH_WANT_OLD_STAT and __ARCH_WANT_STAT64 from the base arch */

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_SYS_ALARM

#define __ARCH_WANT_SYS_GETHOSTNAME

#define __ARCH_WANT_SYS_PAUSE

#define __ARCH_WANT_SYS_SGETMASK

#define __ARCH_WANT_SYS_SIGNAL

#define __ARCH_WANT_SYS_TIME

#define __ARCH_WANT_SYS_UTIME

#define __ARCH_WANT_SYS_WAITPID

#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64

#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_SYS_RT_SIGACTION

#define __ARCH_WANT_SYS_RT_SIGSUSPEND

#endif



#include "asm/arch/unistd.h"



#endif /* _UM_UNISTD_H_*/

arch/um/kernel/exec.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "mem_user.h"

#include "mem_user.h"

#include "skas.h"

#include "skas.h"

#include "os.h"

#include "os.h"

#include "internal.h"





void flush_thread(void)

void flush_thread(void)

{

{

arch/um/kernel/internal.h

0 → 100644
+1 −0
Original line number Original line Diff line number Diff line 
extern long um_execve(char *file, char __user *__user *argv, char __user *__user *env);

arch/um/kernel/syscall.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "asm/mman.h"

#include "asm/mman.h"

#include "asm/uaccess.h"

#include "asm/uaccess.h"

#include "asm/unistd.h"

#include "asm/unistd.h"

#include "internal.h"





long sys_fork(void)

long sys_fork(void)

{

{

arch/um/sys-i386/syscalls.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "linux/sched.h"

#include "linux/sched.h"

#include "linux/shm.h"

#include "linux/shm.h"

#include "linux/ipc.h"

#include "linux/ipc.h"

#include "linux/syscalls.h"

#include "asm/mman.h"

#include "asm/mman.h"

#include "asm/uaccess.h"

#include "asm/uaccess.h"

#include "asm/unistd.h"

#include "asm/unistd.h"