diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 06:57:05 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 06:57:05 +0200 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-arm/unistd.h | |
| parent | [SCSI] 3w-xxxx: convert to use the data buffer accessors (diff) | |
| parent | a bug in ramfs_nommu_resize function, passing old size to vmtruncate (diff) | |
| download | linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.tar.xz linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.zip | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-arm/unistd.h')
| -rw-r--r-- | include/asm-arm/unistd.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index c025ab47e4b9..250d7f145aca 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h @@ -373,6 +373,10 @@ #define __NR_getcpu (__NR_SYSCALL_BASE+345) /* 346 for epoll_pwait */ #define __NR_kexec_load (__NR_SYSCALL_BASE+347) +#define __NR_utimensat (__NR_SYSCALL_BASE+348) +#define __NR_signalfd (__NR_SYSCALL_BASE+349) +#define __NR_timerfd (__NR_SYSCALL_BASE+350) +#define __NR_eventfd (__NR_SYSCALL_BASE+351) /* * The following SWIs are ARM private. @@ -433,5 +437,11 @@ */ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") +/* + * Unimplemented (or alternatively implemented) syscalls + */ +#define __IGNORE_sync_file_range 1 +#define __IGNORE_fadvise64_64 1 + #endif /* __KERNEL__ */ #endif /* __ASM_ARM_UNISTD_H */ |