diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:09:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:09:23 -0700 |
| commit | 2422084a94fcd5038406261b331672a13c92c050 (patch) | |
| tree | 18b8aede90f388b9e2808b1517a105ad5171e6ac /arch/alpha/include/asm/unistd.h | |
| parent | 81cef8e38babd1dd07eb53fccc956620a1b4f32e (diff) | |
| parent | 494486a1d2697f2153199b6501ab5b4d6e15a2bb (diff) | |
| download | kernel_samsung_smdk4412-2422084a94fcd5038406261b331672a13c92c050.tar.gz kernel_samsung_smdk4412-2422084a94fcd5038406261b331672a13c92c050.tar.bz2 kernel_samsung_smdk4412-2422084a94fcd5038406261b331672a13c92c050.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: deal with multiple simultaneously pending signals
alpha: fix a 14 years old bug in sigreturn tracing
alpha: unb0rk sigsuspend() and rt_sigsuspend()
alpha: belated ERESTART_RESTARTBLOCK race fix
alpha: Shift perf event pending work earlier in timer interrupt
alpha: wire up fanotify and prlimit64 syscalls
alpha: kill big kernel lock
alpha: fix build breakage in asm/cacheflush.h
alpha: remove unnecessary cast from void* in assignment.
alpha: Use static const char * const where possible
Diffstat (limited to 'arch/alpha/include/asm/unistd.h')
| -rw-r--r-- | arch/alpha/include/asm/unistd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h index 804e5311c84..058937bf5a7 100644 --- a/arch/alpha/include/asm/unistd.h +++ b/arch/alpha/include/asm/unistd.h @@ -449,10 +449,13 @@ #define __NR_pwritev 491 #define __NR_rt_tgsigqueueinfo 492 #define __NR_perf_event_open 493 +#define __NR_fanotify_init 494 +#define __NR_fanotify_mark 495 +#define __NR_prlimit64 496 #ifdef __KERNEL__ -#define NR_SYSCALLS 494 +#define NR_SYSCALLS 497 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR @@ -463,6 +466,7 @@ #define __ARCH_WANT_SYS_OLD_GETRLIMIT #define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_SIGPENDING +#define __ARCH_WANT_SYS_RT_SIGSUSPEND /* "Conditional" syscalls. What we want is |