Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / include / linux / clocksource.h

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index a16b497d51590dfa5f96c85374f9ac00c893cae3..653f0e2b6ca9a62a450b876c3cf902ea392430d1 100644 (file)
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -162,7 +162,6 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,
  * @archdata:          arch-specific data
  * @suspend:           suspend function for the clocksource, if necessary
  * @resume:            resume function for the clocksource, if necessary
- * @cycle_last:                most recent cycle counter value seen by ::read()
  * @owner:             module reference, must be set by clocksource in modules
  */
 struct clocksource {
@@ -171,7 +170,6 @@ struct clocksource {
         * clocksource itself is cacheline aligned.
         */
        cycle_t (*read)(struct clocksource *cs);
-       cycle_t cycle_last;
        cycle_t mask;
        u32 mult;
        u32 shift;