diff --git a/[refs] b/[refs] index 072da38b3113..6755ac887cf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b97df06ce44b1d145bd1299f50765803c2fabee +refs/heads/master: 8f7db5186cf126b56035d9a9735774d751090d66 diff --git a/trunk/include/asm-x86/syscalls.h b/trunk/include/asm-x86/syscalls.h index 170fcb132f53..3d6b159d348c 100644 --- a/trunk/include/asm-x86/syscalls.h +++ b/trunk/include/asm-x86/syscalls.h @@ -6,7 +6,6 @@ * This file is released under the GPLv2. * See the file COPYING for more details. * - * Please do not call me directly, include linux/syscalls.h */ #ifndef _ASM_X86_SYSCALLS_H @@ -60,6 +59,10 @@ asmlinkage int sys_olduname(struct oldold_utsname __user *); asmlinkage int sys_set_thread_area(struct user_desc __user *); asmlinkage int sys_get_thread_area(struct user_desc __user *); +/* kernel/vm86_32.c */ +asmlinkage int sys_vm86old(struct pt_regs); +asmlinkage int sys_vm86(struct pt_regs); + #else /* CONFIG_X86_32 */ /* X86_64 only */