- UML - remove some dead code
PATCH 1/1 - UML - remove some dead code
Bodo pointed out that arch/um/kernel/skas/exec_user.c is dead code, so this removes it.
arch/um/kernel/skas/Makefile +4 -4
@@ -1,11 +1,11 @@ # -# Copyright (C) 2002 Jeff Dike ([email protected]) +# Copyright (C) 2002 - 2004 Jeff Dike ([email protected]) # Licensed under the GPL # -obj-y := exec_kern.o exec_user.o mem.o mem_user.o mmu.o process.o \ - process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \ - uaccess.o sys-$(SUBARCH)/ +obj-y := exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \ + syscall_kern.o syscall_user.o time.o tlb.o trap_user.o uaccess.o \ + sys-$(SUBARCH)/ subdir-y := util
arch/um/kernel/skas/exec_user.c +0 -63
63 lines not on this page · raw message
Quoted 2 lines · Jeff Dike
Bodo pointed out that
arch/um/kernel/skas/exec_user.cis dead code, so this removes it.
Speaking of dead code: I think you should be able to mostly get rid of the KERNEL_CALL hack in include/asm-um/unistd.h, since all kernel syscalls except execve are now gone.
It should be enough to have an out of line version of execve and do
#undef __KERNEL_SYSCALLS
#include "asm/arch/unistd.h"
extern int execve(const char *filename, char *const argv[],
char *const envp[]); Arnd <><
PATCH 1/1 - UML - cleanup include/asm-um/unistd.h
Quoted 3 lines · Arnd Bergmann
Speaking of dead code: I think you should be able to mostly get rid of the
KERNEL_CALLhack ininclude/asm-um/unistd.h, since all kernel syscalls except execve are now gone.
This from my quilt patches directory (just refreshed and tested (TT only) again just now). This might be a line or two large than it otherwise should be due to whitespace changes...
include/asm-um/unistd.h +14 -91
@@ -42,106 +42,29 @@#include <linux/compiler.h> #include <linux/types.h> -#define KERNEL_CALL(ret_t, sys, args...) \ - mm_segment_t fs = get_fs(); \ - ret_t ret; \ - set_fs(KERNEL_DS); \ - ret = sys(args); \ - set_fs(fs); \ - if (ret >= 0) \ - return ret; \ - errno = -(long)ret; \ - return -1; - -static inline long open (const char *pathname,int flags,int mode) -{ - KERNEL_CALL(int, sys_open, pathname, flags, mode) -} - -static inline long dup (unsigned int fd) -{ -KERNEL_CALL (int, sys_dup, fd); -} - -static inline long close (unsigned int fd) -{ -KERNEL_CALL (int, sys_close, fd); -} - -static inline int execve (const char *filename,char *const argv[], +static inline int execve (const char *filename,char *const argv[],char *const envp[]) { -KERNEL_CALL (int, um_execve, filename, argv, envp); -} +mm_segment_t fs; +int ret; -static inline long waitpid (pid_t pid,unsigned int *status,int options) -{ - KERNEL_CALL(pid_t, sys_wait4, pid, status, options, NULL) -} - -static inline pid_t setsid (void ) -{ - KERNEL_CALL(pid_t, sys_setsid) -} - -static inline long lseek (unsigned int fd,off_t offset,unsigned int whence) -{ - KERNEL_CALL(long, sys_lseek, fd, offset, whence) -} + fs =get_fs (); +set_fs (KERNEL_DS ); + ret =um_execve (filename, argv, envp); +set_fs (fs); -static inline int read (unsigned int fd,char * buf,int len) -{ - KERNEL_CALL(int, sys_read, fd, buf, len) -} +if (ret >=0 ) +return ret; -static inline int write (unsigned int fd,char * buf,int len) -{ - KERNEL_CALL(int, sys_write, fd, buf, len) + errno = -(long )ret; +return -1 ; } -long sys_mmap2 (unsigned long addr,unsigned long len, -unsigned long prot,unsigned long flags, -unsigned long fd,unsigned long pgoff);int sys_execve (char *file,char **argv,char **env); -long sys_clone (unsigned long clone_flags,unsigned long newsp, -int *parent_tid,int *child_tid); -long sys_fork (void ); -long sys_vfork (void ); -int sys_pipe (unsigned long *fildes); -int sys_ptrace (long request,long pid,long addr,long data); -struct sigaction ; -asmlinkage long sys_rt_sigaction (int sig, -const struct sigaction __user *act, -struct sigaction __user *oact, -size_t sigsetsize); - -#endif - -/* Save the value of __KERNEL_SYSCALLS__, undefine it, include the underlying -* arch's unistd.h for the system call numbers, and restore the old -* __KERNEL_SYSCALLS__. -*/ - -#ifdef __KERNEL_SYSCALLS__ -#define __SAVE_KERNEL_SYSCALLS__ __KERNEL_SYSCALLS__ -#endif + +#endif /* __KERNEL_SYSCALLS__ */ #undef __KERNEL_SYSCALLS__#include "asm/arch/unistd.h" -#ifdef __KERNEL_SYSCALLS__ -#define __KERNEL_SYSCALLS__ __SAVE_KERNEL_SYSCALLS__ -#endif - -#endif - -/* -* Overrides for Emacs so that we follow Linus's tabbing style. -* Emacs will notice this stuff at the end of the file and automatically -* adjust the settings for this buffer only. This must remain at the end -* of the file. -* --------------------------------------------------------------------------- -* Local variables: -* c-file-style: "linux" -* End: -*/ +#endif /* _UM_UNISTD_H_*/
Jeff Dike
AppliedRe: [PATCH] - UML - cleanup include/asm-um/unistd.h
Quoted 3 lines · [email protected] said:
This from my quilt patches directory (just refreshed and tested (TT only) again just now). This might be a line or two large than it otherwise should be due to whitespace changes...
Applied, thanks.
Jeff