aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 748ff924a290..22aa9cab3fe5 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4192,7 +4192,6 @@ void account_steal_time(struct task_struct *p, cputime_t steal)
4192 4192
4193 if (p == rq->idle) { 4193 if (p == rq->idle) {
4194 p->stime = cputime_add(p->stime, steal); 4194 p->stime = cputime_add(p->stime, steal);
4195 account_group_system_time(p, steal);
4196 if (atomic_read(&rq->nr_iowait) > 0) 4195 if (atomic_read(&rq->nr_iowait) > 0)
4197 cpustat->iowait = cputime64_add(cpustat->iowait, tmp); 4196 cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
4198 else 4197 else
@@ -4328,7 +4327,7 @@ void __kprobes sub_preempt_count(int val)
4328 /* 4327 /*
4329 * Underflow? 4328 * Underflow?
4330 */ 4329 */
4331 if (DEBUG_LOCKS_WARN_ON(val > preempt_count())) 4330 if (DEBUG_LOCKS_WARN_ON(val > preempt_count() - (!!kernel_locked())))
4332 return; 4331 return;
4333 /* 4332 /*
4334 * Is the spinlock portion underflowing? 4333 * Is the spinlock portion underflowing?