diff --git a/[refs] b/[refs] index 41335edb728f..919b5e92e4db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 266f0566761cf88906d634727b3d9fc2556f5cbd +refs/heads/master: 386dcafaacd212ef4a8aeed67a7db3ffbb44c7b2 diff --git a/trunk/include/asm-i386/unistd.h b/trunk/include/asm-i386/unistd.h index fc1c8ddae149..d983b74e4d9f 100644 --- a/trunk/include/asm-i386/unistd.h +++ b/trunk/include/asm-i386/unistd.h @@ -324,8 +324,6 @@ #define __NR_vmsplice 316 #define __NR_move_pages 317 -#ifdef __KERNEL__ - #define NR_syscalls 318 /* @@ -425,6 +423,8 @@ __asm__ volatile ("push %%ebp ; push %%ebx ; movl 4(%2),%%ebp ; " \ __syscall_return(type,__res); \ } +#ifdef __KERNEL__ + #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT