diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /arch/microblaze/include/asm/unistd.h | |
| parent | telephony: fix return value (diff) | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
| download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/microblaze/include/asm/unistd.h')
| -rw-r--r-- | arch/microblaze/include/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index 2b67e92a773c..d770b00ec6b1 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h @@ -383,8 +383,11 @@ #define __NR_rt_tgsigqueueinfo 365 /* new */ #define __NR_perf_event_open 366 /* new */ #define __NR_recvmmsg 367 /* new */ +#define __NR_fanotify_init 368 +#define __NR_fanotify_mark 369 +#define __NR_prlimit64 370 -#define __NR_syscalls 368 +#define __NR_syscalls 371 #ifdef __KERNEL__ #ifndef __ASSEMBLY__ |