iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-05-13 17:29:03 -07:00
commit ddb503b429
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/alpha/include/asm/unistd.h
View File

@ -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

4
arch/alpha/kernel/systbls.S
View File

@ -515,6 +515,10 @@ sys_call_table:
.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

3
arch/alpha/kernel/time.c
View File

@ -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)