diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 02:54:46 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-05 02:54:46 +0200 |
commit | bdfd6b7d761c7bb8bc93055dac5040ece7d58e10 (patch) | |
tree | 657c9adff148b2cb0f064c5cff96eafd3910d2e3 /arch/microblaze/include/asm/unistd.h | |
parent | Documentation: update cgroups info user groups names (diff) | |
parent | microblaze: Fix ftrace (diff) | |
download | linux-bdfd6b7d761c7bb8bc93055dac5040ece7d58e10.tar.xz linux-bdfd6b7d761c7bb8bc93055dac5040ece7d58e10.zip |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix ftrace
microblaze: Wire up new syscalls
microblaze: Fix level/edge irq sensibility
Diffstat (limited to 'arch/microblaze/include/asm/unistd.h')
-rw-r--r-- | arch/microblaze/include/asm/unistd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index d770b00ec6b1..30edd61a6b8f 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h @@ -386,8 +386,12 @@ #define __NR_fanotify_init 368 #define __NR_fanotify_mark 369 #define __NR_prlimit64 370 +#define __NR_name_to_handle_at 371 +#define __NR_open_by_handle_at 372 +#define __NR_clock_adjtime 373 +#define __NR_syncfs 374 -#define __NR_syscalls 371 +#define __NR_syscalls 375 #ifdef __KERNEL__ #ifndef __ASSEMBLY__ |