Merge tag 'leaks-4.15-rc1' of git://github.com/tcharding/linux

[mirror_ubuntu-bionic-kernel.git] / include / clocksource / arm_arch_timer.h

diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index cc805b72994acd1442a50a4ec6e7d5593a833d76..349e5957c9498db170d85c434d9fc037d5d2acba 100644 (file)
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -67,7 +67,9 @@ enum arch_timer_spi_nr {
 #define ARCH_TIMER_USR_VT_ACCESS_EN    (1 << 8) /* virtual timer registers */
 #define ARCH_TIMER_USR_PT_ACCESS_EN    (1 << 9) /* physical timer registers */
 
-#define ARCH_TIMER_EVT_STREAM_FREQ     10000   /* 100us */
+#define ARCH_TIMER_EVT_STREAM_PERIOD_US        100
+#define ARCH_TIMER_EVT_STREAM_FREQ                             \
+       (USEC_PER_SEC / ARCH_TIMER_EVT_STREAM_PERIOD_US)
 
 struct arch_timer_kvm_info {
        struct timecounter timecounter;
@@ -93,6 +95,7 @@ struct arch_timer_mem {
 extern u32 arch_timer_get_rate(void);
 extern u64 (*arch_timer_read_counter)(void);
 extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void);
+extern bool arch_timer_evtstrm_available(void);
 
 #else
 
@@ -106,6 +109,11 @@ static inline u64 arch_timer_read_counter(void)
        return 0;
 }
 
+static inline bool arch_timer_evtstrm_available(void)
+{
+       return false;
+}
+
 #endif
 
 #endif