Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-7-git-send-email-andi@firstfloor.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

authored by

Andi Kleen and committed by
H. Peter Anvin
ff49103f 35ea7903

+5 -5
+3 -3
arch/x86/include/asm/syscalls.h
··· 24 24 asmlinkage int sys_modify_ldt(int, void __user *, unsigned long); 25 25 26 26 /* kernel/signal.c */ 27 - long sys_rt_sigreturn(void); 27 + asmlinkage long sys_rt_sigreturn(void); 28 28 29 29 /* kernel/tls.c */ 30 30 asmlinkage long sys_set_thread_area(struct user_desc __user *); ··· 34 34 #ifdef CONFIG_X86_32 35 35 36 36 /* kernel/signal.c */ 37 - unsigned long sys_sigreturn(void); 37 + asmlinkage unsigned long sys_sigreturn(void); 38 38 39 39 /* kernel/vm86_32.c */ 40 40 asmlinkage long sys_vm86old(struct vm86_struct __user *); ··· 44 44 45 45 /* X86_64 only */ 46 46 /* kernel/process_64.c */ 47 - long sys_arch_prctl(int, unsigned long); 47 + asmlinkage long sys_arch_prctl(int, unsigned long); 48 48 49 49 /* kernel/sys_x86_64.c */ 50 50 asmlinkage long sys_mmap(unsigned long, unsigned long, unsigned long,
+2 -2
arch/x86/kernel/signal.c
··· 533 533 * Do a signal return; undo the signal stack. 534 534 */ 535 535 #ifdef CONFIG_X86_32 536 - unsigned long sys_sigreturn(void) 536 + asmlinkage unsigned long sys_sigreturn(void) 537 537 { 538 538 struct pt_regs *regs = current_pt_regs(); 539 539 struct sigframe __user *frame; ··· 562 562 } 563 563 #endif /* CONFIG_X86_32 */ 564 564 565 - long sys_rt_sigreturn(void) 565 + asmlinkage long sys_rt_sigreturn(void) 566 566 { 567 567 struct pt_regs *regs = current_pt_regs(); 568 568 struct rt_sigframe __user *frame;