aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/syscalls.h
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2013-03-27 22:18:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-24 11:36:06 -0700
commit7c3f227d5f62d607b4b09d6267a1943e9947dbeb (patch)
tree3d10a5c4be1fc2260d47e5148be650d5a34b8b64 /arch/x86/include/asm/syscalls.h
parenteb1b60a0fbe29e66106b6cb65d17b9dfdb2d335d (diff)
downloadvexpress-lsk-7c3f227d5f62d607b4b09d6267a1943e9947dbeb.tar.gz
x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)
commit 5522ddb3fc0dfd4a503c8278eafd88c9f2d3fada upstream. Commit 49cb25e9290 x86: 'get rid of pt_regs argument in vm86/vm86old' got rid of the pt_regs stub for sys_vm86old and sys_vm86. The functions were, however, not changed to use the calling convention for syscalls. [AV: killed asmlinkage_protect() - it's done automatically now] Backported-by: Satoru Takeuchi <satoru.takeuchi@gmail.com> Reported-and-tested-by: Hans de Bruin <jmdebruin@xmsnet.nl> Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/syscalls.h')
-rw-r--r--arch/x86/include/asm/syscalls.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 6cf0a9cc60c..5a0be0af46c 100644
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -37,8 +37,8 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *);
unsigned long sys_sigreturn(void);
/* kernel/vm86_32.c */
-int sys_vm86old(struct vm86_struct __user *);
-int sys_vm86(unsigned long, unsigned long);
+asmlinkage long sys_vm86old(struct vm86_struct __user *);
+asmlinkage long sys_vm86(unsigned long, unsigned long);
#else /* CONFIG_X86_32 */