Commit ddb503b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/alpha/include/asm/unistd.h

+5 −1
Original line number Diff line number Diff line
@@ -452,10 +452,14 @@ 
#define __NR_fanotify_init		494

#define __NR_fanotify_mark		495

#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__



#define NR_SYSCALLS			497

#define NR_SYSCALLS			501



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/systbls.S

+8 −4
Original line number Diff line number Diff line
@@ -515,6 +515,10 @@ sys_call_table: 
	.quad sys_fanotify_init

	.quad sys_fanotify_mark			/* 495 */

	.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

	.type sys_call_table, @object

arch/alpha/kernel/time.c

+1 −2
Original line number Diff line number Diff line
@@ -375,8 +375,7 @@ static struct clocksource clocksource_rpcc = { 


static inline void register_rpcc_clocksource(long cycle_freq)

{

	clocksource_calc_mult_shift(&clocksource_rpcc, cycle_freq, 4);

	clocksource_register(&clocksource_rpcc);

	clocksource_register_hz(&clocksource_rpcc, cycle_freq);

}

#else /* !CONFIG_SMP */

static inline void register_rpcc_clocksource(long cycle_freq)