diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:04:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:04:05 -0700 |
commit | 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e (patch) | |
tree | fb09c210f8402cb7201b6ae4797343adcf4b73ac /arch/sh/include/asm/unistd_64.h | |
parent | b4a41ed24c858d75985c7dcba685715fdf2e6114 (diff) | |
parent | b15ed691667f59867c9c130b8d84feda4050be04 (diff) |
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix build alloc_thread_info_node function
sh: Fix ptrace hw_breakpoint handling
sh: Fix ptrace fpu state initialisation
sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
sh: pmb: Use struct syscore_ops instead of sysdevs
sh: Use struct syscore_ops instead of sysdevs
sh: Conver to asm-generic/sizes.h.
sh: wire up sys_syncfs.
Diffstat (limited to 'arch/sh/include/asm/unistd_64.h')
-rw-r--r-- | arch/sh/include/asm/unistd_64.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h index 953da4a5219..a694009bb81 100644 --- a/arch/sh/include/asm/unistd_64.h +++ b/arch/sh/include/asm/unistd_64.h @@ -393,10 +393,11 @@ #define __NR_name_to_handle_at 370 #define __NR_open_by_handle_at 371 #define __NR_clock_adjtime 372 +#define __NR_syncfs 373 #ifdef __KERNEL__ -#define NR_syscalls 373 +#define NR_syscalls 374 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |