diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 14:37:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 14:37:05 +0200 |
| commit | 8e5d0661b3948f3c5a143f32d192710375822af2 (patch) | |
| tree | ca18920d3f7219f7ffb7ca2fa372b82558938006 /arch/alpha/include/asm/unistd.h | |
| parent | spi/pl022: Devicetree support w/o platform data (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-8e5d0661b3948f3c5a143f32d192710375822af2.tar.xz linux-8e5d0661b3948f3c5a143f32d192710375822af2.zip | |
Merge tag 'v3.6-rc6' into spi-drivers
Linux 3.6-rc6
Conflicts:
drivers/spi/spi-omap2-mcspi.c
Diffstat (limited to 'arch/alpha/include/asm/unistd.h')
| -rw-r--r-- | arch/alpha/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 633b23b0664a..a31a78eac9b9 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -465,10 +465,12 @@ #define __NR_setns 501 #define __NR_accept4 502 #define __NR_sendmmsg 503 +#define __NR_process_vm_readv 504 +#define __NR_process_vm_writev 505 #ifdef __KERNEL__ -#define NR_SYSCALLS 504 +#define NR_SYSCALLS 506 #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_STAT64 |