Commit ddb503b4 authored by Linus Torvalds's avatar Linus Torvalds

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: Wire up syscalls new to 2.6.39
  alpha: convert to clocksource_register_hz
parents 298eaaad 90b57f35
...@@ -452,10 +452,14 @@ ...@@ -452,10 +452,14 @@
#define __NR_fanotify_init 494 #define __NR_fanotify_init 494
#define __NR_fanotify_mark 495 #define __NR_fanotify_mark 495
#define __NR_prlimit64 496 #define __NR_prlimit64 496
#define __NR_name_to_handle_at 497
#define __NR_open_by_handle_at 498
#define __NR_clock_adjtime 499
#define __NR_syncfs 500
#ifdef __KERNEL__ #ifdef __KERNEL__
#define NR_SYSCALLS 497 #define NR_SYSCALLS 501
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
......
...@@ -498,23 +498,27 @@ sys_call_table: ...@@ -498,23 +498,27 @@ sys_call_table:
.quad sys_ni_syscall /* sys_timerfd */ .quad sys_ni_syscall /* sys_timerfd */
.quad sys_eventfd .quad sys_eventfd
.quad sys_recvmmsg .quad sys_recvmmsg
.quad sys_fallocate /* 480 */ .quad sys_fallocate /* 480 */
.quad sys_timerfd_create .quad sys_timerfd_create
.quad sys_timerfd_settime .quad sys_timerfd_settime
.quad sys_timerfd_gettime .quad sys_timerfd_gettime
.quad sys_signalfd4 .quad sys_signalfd4
.quad sys_eventfd2 /* 485 */ .quad sys_eventfd2 /* 485 */
.quad sys_epoll_create1 .quad sys_epoll_create1
.quad sys_dup3 .quad sys_dup3
.quad sys_pipe2 .quad sys_pipe2
.quad sys_inotify_init1 .quad sys_inotify_init1
.quad sys_preadv /* 490 */ .quad sys_preadv /* 490 */
.quad sys_pwritev .quad sys_pwritev
.quad sys_rt_tgsigqueueinfo .quad sys_rt_tgsigqueueinfo
.quad sys_perf_event_open .quad sys_perf_event_open
.quad sys_fanotify_init .quad sys_fanotify_init
.quad sys_fanotify_mark /* 495 */ .quad sys_fanotify_mark /* 495 */
.quad sys_prlimit64 .quad sys_prlimit64
.quad sys_name_to_handle_at
.quad sys_open_by_handle_at
.quad sys_clock_adjtime
.quad sys_syncfs /* 500 */
.size sys_call_table, . - sys_call_table .size sys_call_table, . - sys_call_table
.type sys_call_table, @object .type sys_call_table, @object
......
...@@ -375,8 +375,7 @@ static struct clocksource clocksource_rpcc = { ...@@ -375,8 +375,7 @@ static struct clocksource clocksource_rpcc = {
static inline void register_rpcc_clocksource(long cycle_freq) static inline void register_rpcc_clocksource(long cycle_freq)
{ {
clocksource_calc_mult_shift(&clocksource_rpcc, cycle_freq, 4); clocksource_register_hz(&clocksource_rpcc, cycle_freq);
clocksource_register(&clocksource_rpcc);
} }
#else /* !CONFIG_SMP */ #else /* !CONFIG_SMP */
static inline void register_rpcc_clocksource(long cycle_freq) static inline void register_rpcc_clocksource(long cycle_freq)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment