From ff18952f0319d249cd6a87a4d57b197415527bbc Mon Sep 17 00:00:00 2001 From: Venkatesh Pallipadi Date: Tue, 21 Dec 2010 17:09:04 -0800 Subject: [PATCH] --- yaml --- r: 234544 b: refs/heads/master c: 414bee9ba613adb3804965e2d84db32d0599f9c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d134bd587808..672e08bbf49f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abb74cefa9c682fb38ba86c17ca3c86fed6cc464 +refs/heads/master: 414bee9ba613adb3804965e2d84db32d0599f9c6 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2a3c9799d76b..8b718b59b09f 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3686,6 +3686,14 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick, cpustat->irq = cputime64_add(cpustat->irq, tmp); } else if (irqtime_account_si_update()) { cpustat->softirq = cputime64_add(cpustat->softirq, tmp); + } else if (this_cpu_ksoftirqd() == p) { + /* + * ksoftirqd time do not get accounted in cpu_softirq_time. + * So, we have to handle it separately here. + * Also, p->stime needs to be updated for ksoftirqd. + */ + __account_system_time(p, cputime_one_jiffy, one_jiffy_scaled, + &cpustat->softirq); } else if (user_tick) { account_user_time(p, cputime_one_jiffy, one_jiffy_scaled); } else if (p == rq->idle) {