Commit ffe6da91 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'timers-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single fix adding the missing time namespace adjustment in
  sys/sysinfo which caused sys/sysinfo to be inconsistent with
  /proc/uptime when read from a task inside a time namespace"

* tag 'timers-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sys/sysinfo: Respect boottime inside time namespace
parents 52ac3777 ecc421e0
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/kprobes.h> #include <linux/kprobes.h>
#include <linux/user_namespace.h> #include <linux/user_namespace.h>
#include <linux/time_namespace.h>
#include <linux/binfmts.h> #include <linux/binfmts.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info) ...@@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info)
memset(info, 0, sizeof(struct sysinfo)); memset(info, 0, sizeof(struct sysinfo));
ktime_get_boottime_ts64(&tp); ktime_get_boottime_ts64(&tp);
timens_add_boottime(&tp);
info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT); get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment