tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds ffe6da91 52ac3777

options
unified split
Changed files
+2
kernel
sys.c
+2
kernel/sys.c
··· 47 #include <linux/syscalls.h> 48 #include <linux/kprobes.h> 49 #include <linux/user_namespace.h> 50 #include <linux/binfmts.h> 51 52 #include <linux/sched.h> ··· 2547 memset(info, 0, sizeof(struct sysinfo)); 2548 2549 ktime_get_boottime_ts64(&tp); 2550 info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); 2551 2552 get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
··· 47 #include <linux/syscalls.h> 48 #include <linux/kprobes.h> 49 #include <linux/user_namespace.h> 50 + #include <linux/time_namespace.h> 51 #include <linux/binfmts.h> 52 53 #include <linux/sched.h> ··· 2546 memset(info, 0, sizeof(struct sysinfo)); 2547 2548 ktime_get_boottime_ts64(&tp); 2549 + timens_add_boottime(&tp); 2550 info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); 2551 2552 get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);