diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:05 -0400 |
| commit | 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e (patch) | |
| tree | fb09c210f8402cb7201b6ae4797343adcf4b73ac /arch/sh/kernel/syscalls_64.S | |
| 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/kernel/syscalls_64.S')
| -rw-r--r-- | arch/sh/kernel/syscalls_64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 44e7b00c806..ca0a6142ab6 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
| @@ -399,3 +399,4 @@ sys_call_table: | |||
| 399 | .long sys_name_to_handle_at /* 370 */ | 399 | .long sys_name_to_handle_at /* 370 */ |
| 400 | .long sys_open_by_handle_at | 400 | .long sys_open_by_handle_at |
| 401 | .long sys_clock_adjtime | 401 | .long sys_clock_adjtime |
| 402 | .long sys_syncfs | ||