[GIT pull] timers/urgent for 5.4-rc5

* [GIT pull] timers/urgent for 5.4-rc5
  2019-10-27  6:46 [GIT pull] irq/urgent for 5.4-rc5 Thomas Gleixner
  2019-10-27  6:46 ` [GIT pull] x86/urgent " Thomas Gleixner
  2019-10-27  6:46 ` [GIT pull] perf/urgent " Thomas Gleixner
@ 2019-10-27  6:46 ` Thomas Gleixner
  2019-10-27 11:30   ` pr-tracker-bot
  2019-10-27 11:30 ` [GIT pull] irq/urgent " pr-tracker-bot
  3 siblings, 1 reply; 8+ messages in thread
From: Thomas Gleixner @ 2019-10-27  6:46 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, x86

Linus,

please pull the latest timers-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

up to:  7f2cbcbcafbc: posix-cpu-timers: Fix two trivial comments

A small set of fixes for time(keeping):

 - Add a missing include to prevent compiler warnings.

 - Make the VDSO implementation of clock_getres() POSIX compliant again.
   A recent change dropped the NULL pointer guard which is required as
   NULL is a valid pointer value for this function.

 - Fix two function documentation typos.

Thanks,

	tglx

------------------>
Ben Dooks (Codethink) (1):
      timers/sched_clock: Include local timekeeping.h for missing declarations

Thomas Gleixner (1):
      lib/vdso: Make clock_getres() POSIX compliant again

Yi Wang (1):
      posix-cpu-timers: Fix two trivial comments


 kernel/time/posix-cpu-timers.c | 6 +++---
 kernel/time/sched_clock.c      | 2 ++
 lib/vdso/gettimeofday.c        | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 92a431981b1c..42d512fcfda2 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -266,7 +266,7 @@ static void update_gt_cputime(struct task_cputime_atomic *cputime_atomic,
 /**
  * thread_group_sample_cputime - Sample cputime for a given task
  * @tsk:	Task for which cputime needs to be started
- * @iimes:	Storage for time samples
+ * @samples:	Storage for time samples
  *
  * Called from sys_getitimer() to calculate the expiry time of an active
  * timer. That means group cputime accounting is already active. Called
@@ -1038,12 +1038,12 @@ static void posix_cpu_timer_rearm(struct k_itimer *timer)
  * member of @pct->bases[CLK].nextevt. False otherwise
  */
 static inline bool
-task_cputimers_expired(const u64 *sample, struct posix_cputimers *pct)
+task_cputimers_expired(const u64 *samples, struct posix_cputimers *pct)
 {
 	int i;
 
 	for (i = 0; i < CPUCLOCK_MAX; i++) {
-		if (sample[i] >= pct->bases[i].nextevt)
+		if (samples[i] >= pct->bases[i].nextevt)
 			return true;
 	}
 	return false;
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index 142b07619918..dbd69052eaa6 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -17,6 +17,8 @@
 #include <linux/seqlock.h>
 #include <linux/bitops.h>
 
+#include "timekeeping.h"
+
 /**
  * struct clock_read_data - data required to read from sched_clock()
  *
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index e630e7ff57f1..45f57fd2db64 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -214,9 +214,10 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
 		return -1;
 	}
 
-	res->tv_sec = 0;
-	res->tv_nsec = ns;
-
+	if (likely(res)) {
+		res->tv_sec = 0;
+		res->tv_nsec = ns;
+	}
 	return 0;
 }
 
@@ -245,7 +246,7 @@ __cvdso_clock_getres_time32(clockid_t clock, struct old_timespec32 *res)
 		ret = clock_getres_fallback(clock, &ts);
 #endif
 
-	if (likely(!ret)) {
+	if (likely(!ret && res)) {
 		res->tv_sec = ts.tv_sec;
 		res->tv_nsec = ts.tv_nsec;
 	}



^ permalink raw reply related	[flat|nested] 8+ messages in thread