diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 04:33:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 04:33:23 +0200 |
| commit | 9873aed5a90aefb1642a85070c35088cca8b6a92 (patch) | |
| tree | be7d6cf2a3e0c71faa861e0c5d0c9bc4c5f40a10 /include/asm-s390/unistd.h | |
| parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/coolo... (diff) | |
| parent | [S390] Fix sclp_vt220 error handling. (diff) | |
| download | linux-9873aed5a90aefb1642a85070c35088cca8b6a92.tar.xz linux-9873aed5a90aefb1642a85070c35088cca8b6a92.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Fix sclp_vt220 error handling.
[S390] cio: Reorganize initialization.
[S390] cio: Make CIO_* macros safe if dbfs are not available.
[S390] cio: Clean up messages.
[S390] Fix IRQ tracing.
[S390] vmur: fix diag14_read.
[S390] Wire up sys_fallocate.
[S390] add types.h include to s390_ext.h
[S390] cio: Remove deprecated rdc/rcd.
[S390] Get rid of new section mismatch warnings.
[S390] sclp: kill unused SCLP config option.
[S390] cio: Remove remains of _ccw_device_get_device_number().
[S390] cio: css_sch_device_register() can be made static.
[S390] Improve __smp_call_function_map.
[S390] Convert to smp_call_function_single.
Diffstat (limited to 'include/asm-s390/unistd.h')
| -rw-r--r-- | include/asm-s390/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 790c1c557417..f04acb2670a8 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h @@ -251,7 +251,7 @@ #define __NR_getcpu 311 #define __NR_epoll_pwait 312 #define __NR_utimes 313 -/* Number 314 is reserved for new sys_fallocate */ +#define __NR_fallocate 314 #define __NR_utimensat 315 #define __NR_signalfd 316 #define __NR_timerfd 317 |