Messages in this thread Patch in this message | | | Date | Sun, 15 Mar 2020 15:14:38 -0000 | From | Thomas Gleixner <> | Subject | [GIT pull] timers/urgent for 5.6-rc6 |
| |
Linus,
please pull the latest timers/urgent branch from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2020-03-15
up to: ecc421e05bab: sys/sysinfo: Respect boottime inside time namespace
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.
Thanks,
tglx
------------------> Cyril Hrubis (1): sys/sysinfo: Respect boottime inside time namespace
kernel/sys.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/kernel/sys.c b/kernel/sys.c index f9bc5c303e3f..d325f3ab624a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -47,6 +47,7 @@ #include <linux/syscalls.h> #include <linux/kprobes.h> #include <linux/user_namespace.h> +#include <linux/time_namespace.h> #include <linux/binfmts.h> #include <linux/sched.h> @@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info) memset(info, 0, sizeof(struct sysinfo)); ktime_get_boottime_ts64(&tp); + timens_add_boottime(&tp); info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
| |