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

Commit ff49103f authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, asmlinkage: Make various syscalls asmlinkage 



FWIW I suspect sys_rt_sigreturn/sys_sigreturn should use
standard SYSCALL wrappers.  But I didn't do that change in this
patch.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-7-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 35ea7903

arch/x86/include/asm/syscalls.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ asmlinkage long sys_iopl(unsigned int); 
asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);



/* kernel/signal.c */

long sys_rt_sigreturn(void);

asmlinkage long sys_rt_sigreturn(void);



/* kernel/tls.c */

asmlinkage long sys_set_thread_area(struct user_desc __user *);
@@ -34,7 +34,7 @@ asmlinkage long sys_get_thread_area(struct user_desc __user *); 
#ifdef CONFIG_X86_32



/* kernel/signal.c */

unsigned long sys_sigreturn(void);

asmlinkage unsigned long sys_sigreturn(void);



/* kernel/vm86_32.c */

asmlinkage long sys_vm86old(struct vm86_struct __user *);
@@ -44,7 +44,7 @@ asmlinkage long sys_vm86(unsigned long, unsigned long); 


/* X86_64 only */

/* kernel/process_64.c */

long sys_arch_prctl(int, unsigned long);

asmlinkage long sys_arch_prctl(int, unsigned long);



/* kernel/sys_x86_64.c */

asmlinkage long sys_mmap(unsigned long, unsigned long, unsigned long,

arch/x86/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, 
 * Do a signal return; undo the signal stack.

 */

#ifdef CONFIG_X86_32

unsigned long sys_sigreturn(void)

asmlinkage unsigned long sys_sigreturn(void)

{

	struct pt_regs *regs = current_pt_regs();

	struct sigframe __user *frame;
@@ -562,7 +562,7 @@ unsigned long sys_sigreturn(void) 
}

#endif /* CONFIG_X86_32 */



long sys_rt_sigreturn(void)

asmlinkage long sys_rt_sigreturn(void)

{

	struct pt_regs *regs = current_pt_regs();

	struct rt_sigframe __user *frame;