diff options
author | Andy Lutomirski <luto@mit.edu> | 2011-07-13 09:24:15 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 20:57:09 -0400 |
commit | 574c44fa8fa6262ffd5939789ef51a6e98ed62d7 (patch) | |
tree | 4ae27eab58a2609beae88129bc3c2267b391dd9a /include/linux/clocksource.h | |
parent | 98d0ac38ca7b1b7a552c9a2359174ff84decb600 (diff) |
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 'include/linux/clocksource.h')
-rw-r--r-- | include/linux/clocksource.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 0fb83c224471..6bb69702c4fa 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h | |||
@@ -171,13 +171,6 @@ struct clocksource { | |||
171 | u32 shift; | 171 | u32 shift; |
172 | u64 max_idle_ns; | 172 | u64 max_idle_ns; |
173 | 173 | ||
174 | #ifdef CONFIG_IA64 | ||
175 | void *fsys_mmio; /* used by fsyscall asm code */ | ||
176 | #define CLKSRC_FSYS_MMIO_SET(mmio, addr) ((mmio) = (addr)) | ||
177 | #else | ||
178 | #define CLKSRC_FSYS_MMIO_SET(mmio, addr) do { } while (0) | ||
179 | #endif | ||
180 | |||
181 | #ifdef __ARCH_HAS_CLOCKSOURCE_DATA | 174 | #ifdef __ARCH_HAS_CLOCKSOURCE_DATA |
182 | struct arch_clocksource_data archdata; | 175 | struct arch_clocksource_data archdata; |
183 | #endif | 176 | #endif |