diff options
Diffstat (limited to 'arch/ia64/kernel/time.c')
| -rw-r--r-- | arch/ia64/kernel/time.c | 19 | 
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 71c52bc7c28d..9a0104a38cd3 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = {  	.name =		"timer"  }; -static struct platform_device rtc_efi_dev = { -	.name = "rtc-efi", -	.id = -1, -}; - -static int __init rtc_init(void) -{ -	if (platform_device_register(&rtc_efi_dev) < 0) -		printk(KERN_ERR "unable to register rtc device...\n"); - -	/* not necessarily an error */ -	return 0; -} -module_init(rtc_init); -  void read_persistent_clock(struct timespec *ts)  {  	efi_gettimeofday(ts); @@ -441,7 +426,7 @@ void update_vsyscall_tz(void)  }  void update_vsyscall_old(struct timespec *wall, struct timespec *wtm, -			struct clocksource *c, u32 mult) +			 struct clocksource *c, u32 mult, cycle_t cycle_last)  {  	write_seqcount_begin(&fsyscall_gtod_data.seq); @@ -450,7 +435,7 @@ void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,          fsyscall_gtod_data.clk_mult = mult;          fsyscall_gtod_data.clk_shift = c->shift;          fsyscall_gtod_data.clk_fsys_mmio = c->archdata.fsys_mmio; -        fsyscall_gtod_data.clk_cycle_last = c->cycle_last; +        fsyscall_gtod_data.clk_cycle_last = cycle_last;  	/* copy kernel time structures */          fsyscall_gtod_data.wall_time.tv_sec = wall->tv_sec;  |