diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 10:31:36 -0400 |
| commit | 31e77ac55f18db0ec1c724840927562ef3093ef6 (patch) | |
| tree | 01bb0ac2868debd2246df4c5e5617a2ce9f09600 /include/asm-i386/unistd.h | |
| parent | 5029996547a9f3988459e11955c13259495308ef (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
| download | kernel-crypto-31e77ac55f18db0ec1c724840927562ef3093ef6.tar.gz kernel-crypto-31e77ac55f18db0ec1c724840927562ef3093ef6.tar.xz kernel-crypto-31e77ac55f18db0ec1c724840927562ef3093ef6.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-i386/unistd.h')
| -rw-r--r-- | include/asm-i386/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h index fc1c8ddae14..d983b74e4d9 100644 --- a/include/asm-i386/unistd.h +++ b/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 |