From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2014 18:13:28 +0000 (-0800)
Subject: Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d82012695ef29e4e1c8153ccf43098ec8e50369e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'timers-2038-for-linus' of git://git./linux/kernel/git/tip/tip

Pull more 2038 timer work from Thomas Gleixner:
 "Two more patches for the ongoing 2038 work:

   - New accessors to clock MONOTONIC and REALTIME seconds

  This is a seperate branch as Arnd has follow up work depending on
  this"

* 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Provide y2038 safe accessor to the seconds portion of CLOCK_REALTIME
  timekeeping: Provide fast accessor to the seconds part of CLOCK_MONOTONIC
---

d82012695ef29e4e1c8153ccf43098ec8e50369e
diff --cc include/linux/timekeeping.h
index 961fea373f83,91454dea2bc6..9b63d13ba82b
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@@ -25,9 -25,11 +25,11 @@@ struct timespec __current_kernel_time(v
  /*
   * timespec based interfaces
   */
 -struct timespec get_monotonic_coarse(void);
 -extern void getrawmonotonic(struct timespec *ts);
 +struct timespec64 get_monotonic_coarse64(void);
 +extern void getrawmonotonic64(struct timespec64 *ts);
  extern void ktime_get_ts64(struct timespec64 *ts);
+ extern time64_t ktime_get_seconds(void);
+ extern time64_t ktime_get_real_seconds(void);
  
  extern int __getnstimeofday64(struct timespec64 *tv);
  extern void getnstimeofday64(struct timespec64 *tv);