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

Commit e32dacb9 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: system call path cleanup 



This merges two sets of files which had no business being split apart in the
first place.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 08964c56

arch/um/include/syscall_user.h→arch/um/include/syscall.h

+12 −0
Original line number Diff line number Diff line
@@ -10,14 +10,3 @@ extern int record_syscall_start(int syscall); 
extern void record_syscall_end(int index, long result);



#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:

 */

arch/um/include/sysdep-i386/syscalls.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ extern syscall_handler_t sys_rt_sigaction; 


extern syscall_handler_t old_mmap_i386;



extern syscall_handler_t *sys_call_table[];



#define EXECUTE_SYSCALL(syscall, regs) \

	((long (*)(struct syscall_args)) (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))

arch/um/include/sysdep-x86_64/syscalls.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ typedef long syscall_handler_t(void); 


extern syscall_handler_t *ia32_sys_call_table[];



extern syscall_handler_t *sys_call_table[];



#define EXECUTE_SYSCALL(syscall, regs) \

	(((long (*)(long, long, long, long, long, long)) \

	  (*sys_call_table[syscall]))(UPT_SYSCALL_ARG1(&regs->regs), \

arch/um/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o 
obj-$(CONFIG_GPROF)	+= gprof_syms.o

obj-$(CONFIG_GCOV)	+= gmon_syms.o

obj-$(CONFIG_TTY_LOG)	+= tty_log.o

obj-$(CONFIG_SYSCALL_DEBUG) += syscall_user.o

obj-$(CONFIG_SYSCALL_DEBUG) += syscall.o



obj-$(CONFIG_MODE_TT) += tt/

obj-$(CONFIG_MODE_SKAS) += skas/

arch/um/kernel/skas/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



obj-y := clone.o exec_kern.o mem.o mem_user.o mmu.o process.o process_kern.o \

	syscall_kern.o syscall_user.o tlb.o trap_user.o uaccess.o \

	syscall.o tlb.o trap_user.o uaccess.o



subdir- := util