summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/cyclone.c
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@mit.edu>2011-07-13 15:24:15 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-15 02:57:09 +0200
commit574c44fa8fa6262ffd5939789ef51a6e98ed62d7 (patch)
tree4ae27eab58a2609beae88129bc3c2267b391dd9a /arch/ia64/kernel/cyclone.c
parentx86-64: Move vread_tsc and vread_hpet into the vDSO (diff)
downloadlinux-574c44fa8fa6262ffd5939789ef51a6e98ed62d7.tar.xz
linux-574c44fa8fa6262ffd5939789ef51a6e98ed62d7.zip
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: Andy Lutomirski <luto@mit.edu> Link: http://lkml.kernel.org/r/d31de0ee0842a0e322fb6441571c2b0adb323fa2.1310563276.git.luto@mit.edu Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/ia64/kernel/cyclone.c')
-rw-r--r--arch/ia64/kernel/cyclone.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index f64097b5118a..4826ff957a3d 100644
--- a/arch/ia64/kernel/cyclone.c
+++ b/arch/ia64/kernel/cyclone.c
@@ -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;