diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-07 19:58:54 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:07 -0500 |
commit | 7b1f62076bba10786d2118006ae68ac120cd6c56 (patch) | |
tree | 9af9f556fc331c77644c2e1c4eafdddad60019b1 /include/linux/time.h | |
parent | 547046f2f09f1837d39619afbc7a6e35673d7c98 (diff) |
time: convert arch_gettimeoffset to a pointer
Currently, whenever CONFIG_ARCH_USES_GETTIMEOFFSET is enabled, each
arch core provides a single implementation of arch_gettimeoffset(). In
many cases, different sub-architectures, different machines, or
different timer providers exist, and so the arch ends up implementing
arch_gettimeoffset() as a call-through-pointer anyway. Examples are
ARM, Cris, M68K, and it's arguable that the remaining architectures,
M32R and Blackfin, should be doing this anyway.
Modify arch_gettimeoffset so that it itself is a function pointer, which
the arch initializes. This will allow later changes to move the
initialization of this function into individual machine support or timer
drivers. This is particularly useful for code in drivers/clocksource
which should rely on an arch-independant mechanism to register their
implementation of arch_gettimeoffset().
This patch also converts the Cris architecture to set arch_gettimeoffset
directly to the final implementation in time_init(), because Cris already
had separate time_init() functions per sub-architecture. M68K and ARM
are converted to set arch_gettimeoffset to the final implementation in
later patches, because they already have function pointers in place for
this purpose.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'include/linux/time.h')
-rw-r--r-- | include/linux/time.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 4d358e9d10f1..05e32a72103c 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -142,9 +142,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta); | |||
142 | * finer then tick granular time. | 142 | * finer then tick granular time. |
143 | */ | 143 | */ |
144 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET | 144 | #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET |
145 | extern u32 arch_gettimeoffset(void); | 145 | extern u32 (*arch_gettimeoffset)(void); |
146 | #else | ||
147 | static inline u32 arch_gettimeoffset(void) { return 0; } | ||
148 | #endif | 146 | #endif |
149 | 147 | ||
150 | extern void do_gettimeofday(struct timeval *tv); | 148 | extern void do_gettimeofday(struct timeval *tv); |