Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 574c44fa authored by Andy Lutomirski's avatar Andy Lutomirski Committed by H. Peter Anvin
Browse files

ia64: Replace clocksource.fsys_mmio with generic arch data 



Now that clocksource.archdata is available, use it for ia64-specific
code.

Cc: Clemens Ladisch <clemens@ladisch.de>
Cc: linux-ia64@vger.kernel.org
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndy Lutomirski <luto@mit.edu>
Link: http://lkml.kernel.org/r/d31de0ee0842a0e322fb6441571c2b0adb323fa2.1310563276.git.luto@mit.edu


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 98d0ac38

arch/ia64/include/asm/clocksource.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* IA64-specific clocksource additions */



#ifndef _ASM_IA64_CLOCKSOURCE_H

#define _ASM_IA64_CLOCKSOURCE_H



#define __ARCH_HAS_CLOCKSOURCE_DATA



struct arch_clocksource_data {

	void *fsys_mmio;        /* used by fsyscall asm code */

};



#endif /* _ASM_IA64_CLOCKSOURCE_H */

arch/ia64/kernel/cyclone.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int __init init_cyclone_clock(void) 
	}

	/* initialize last tick */

	cyclone_mc = cyclone_timer;

	clocksource_cyclone.fsys_mmio = cyclone_timer;

	clocksource_cyclone.archdata.fsys_mmio = cyclone_timer;

	clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);



	return 0;

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ void update_vsyscall(struct timespec *wall, struct timespec *wtm, 
        fsyscall_gtod_data.clk_mask = c->mask;

        fsyscall_gtod_data.clk_mult = mult;

        fsyscall_gtod_data.clk_shift = c->shift;

        fsyscall_gtod_data.clk_fsys_mmio = c->fsys_mmio;

        fsyscall_gtod_data.clk_fsys_mmio = c->archdata.fsys_mmio;

        fsyscall_gtod_data.clk_cycle_last = c->cycle_last;



	/* copy kernel time structures */

arch/ia64/sn/kernel/sn2/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ia64_sn_udelay (unsigned long usecs) 


void __init sn_timer_init(void)

{

	clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;

	clocksource_sn2.archdata.fsys_mmio = RTC_COUNTER_ADDR;

	clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);



	ia64_udelay = &ia64_sn_udelay;

drivers/char/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ int hpet_alloc(struct hpet_data *hdp) 
#ifdef CONFIG_IA64

	if (!hpet_clocksource) {

		hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;

		CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);

		clocksource_hpet.archdata.fsys_mmio = hpet_mctr;

		clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq);

		hpetp->hp_clocksource = &clocksource_hpet;

		hpet_clocksource = &clocksource_hpet;