diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 03:11:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 03:11:49 +0200 |
| commit | 2a6a432a9ce55876b92f9ea860d7baa05538de16 (patch) | |
| tree | f64431e3f5f105ee350831aef6810281d93e10b1 /arch/arm/include/asm/unistd.h | |
| parent | arcmsr_hba: Missing slab.h include (diff) | |
| parent | VIDEO: amba clcd: don't disable an already disabled clock (diff) | |
| download | linux-2a6a432a9ce55876b92f9ea860d7baa05538de16.tar.xz linux-2a6a432a9ce55876b92f9ea860d7baa05538de16.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: amba clcd: don't disable an already disabled clock
ARM: Tighten check for allowable CPSR values
ARM: 6329/1: wire up sys_accept4() on ARM
ARM: 6328/1: Build with -fno-dwarf2-cfi-asm
ARM: 6326/1: kgdb: fix GDB_MAX_REGS no longer used
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
| -rw-r--r-- | arch/arm/include/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index dd2bf53000fe..d02cfb683487 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h @@ -392,6 +392,7 @@ #define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363) #define __NR_perf_event_open (__NR_SYSCALL_BASE+364) #define __NR_recvmmsg (__NR_SYSCALL_BASE+365) +#define __NR_accept4 (__NR_SYSCALL_BASE+366) /* * The following SWIs are ARM private. |