Unverified Commit 198490c5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2650 sched/cpuacct: Fix charge cpuacct.usage_sys 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xia Fukun <xiafukun@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BFLZB5D4ACPYCQSHJ3UBYMPFZ6PXTPA3/ 
 
https://gitee.com/openeuler/kernel/issues/I8BN4B 
 
Link:https://gitee.com/openeuler/kernel/pulls/2650

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 9ee0824e f5f92020

kernel/sched/cpuacct.c

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Based on the work by Paul Menage (menage@google.com) and Balbir Singh

 * (balbir@in.ibm.com).

 */

#include <asm/irq_regs.h>

#include "sched.h"



/* Time spent by the tasks of the CPU accounting group executing in ... */
@@ -339,7 +340,7 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime) 
{

	struct cpuacct *ca;

	int index = CPUACCT_STAT_SYSTEM;

	struct pt_regs *regs = task_pt_regs(tsk);

	struct pt_regs *regs = get_irq_regs() ? : task_pt_regs(tsk);



	if (regs && user_mode(regs))

		index = CPUACCT_STAT_USER;