read_current_timer() cleanups
- All implementations can be __devinit - The function prototypes were in asm/timex.h but they all must be the same, so create a single declaration in linux/timex.h. - uninline the sparc64 version to match the other architectures - Don't bother #defining ARCH_HAS_READ_CURRENT_TIMER to a particular value. [ezk@cs.sunysb.edu: fix build] Cc: "David S. Miller" <davem@davemloft.net> Cc: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
83bad1d764
commit
941e492bdb
@@ -34,7 +34,6 @@ static inline cycles_t get_cycles (void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern int read_current_timer(unsigned long *timer_value);
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER 1
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER
|
||||
|
||||
#endif /* __ASM_AVR32_TIMEX_H */
|
||||
|
||||
@@ -14,10 +14,6 @@
|
||||
typedef unsigned long cycles_t;
|
||||
#define get_cycles() tick_ops->get_tick()
|
||||
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER 1
|
||||
#define read_current_timer(timer_val_p) \
|
||||
({ *timer_val_p = tick_ops->get_tick(); \
|
||||
0; \
|
||||
})
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER
|
||||
|
||||
#endif
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#endif
|
||||
#define CLOCK_TICK_RATE PIT_TICK_RATE
|
||||
|
||||
extern int read_current_timer(unsigned long *timer_value);
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER 1
|
||||
#define ARCH_HAS_READ_CURRENT_TIMER
|
||||
|
||||
#endif
|
||||
|
||||
@@ -244,6 +244,8 @@ extern int do_adjtimex(struct timex *);
|
||||
/* Don't use! Compatibility define for existing users. */
|
||||
#define tickadj (500/HZ ? : 1)
|
||||
|
||||
int read_current_timer(unsigned long *timer_val);
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* LINUX_TIMEX_H */
|
||||
|
||||
Reference in New Issue
Block a user