Commit 4340ebd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fix from Ingo Molnar:
 "Fix the guest-nice cpustat values in /proc"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/cputime, proc/stat: Fix incorrect guest nice cpustat value
parents 89c683cd 346da4d2

fs/proc/stat.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int show_stat(struct seq_file *p, void *v) 
		softirq		+= cpustat[CPUTIME_SOFTIRQ];

		steal		+= cpustat[CPUTIME_STEAL];

		guest		+= cpustat[CPUTIME_GUEST];

		guest_nice	+= cpustat[CPUTIME_USER];

		guest_nice	+= cpustat[CPUTIME_GUEST_NICE];

		sum		+= kstat_cpu_irqs_sum(i);

		sum		+= arch_irq_stat_cpu(i);
@@ -175,7 +175,7 @@ static int show_stat(struct seq_file *p, void *v) 
		softirq		= cpustat[CPUTIME_SOFTIRQ];

		steal		= cpustat[CPUTIME_STEAL];

		guest		= cpustat[CPUTIME_GUEST];

		guest_nice	= cpustat[CPUTIME_USER];

		guest_nice	= cpustat[CPUTIME_GUEST_NICE];

		seq_printf(p, "cpu%d", i);

		seq_put_decimal_ull(p, " ", nsec_to_clock_t(user));

		seq_put_decimal_ull(p, " ", nsec_to_clock_t(nice));

CRA Git | Maintained and supported by SUSTech CRA and CCSE