diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 9b1e79371c20..558e5f284269 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4202,7 +4202,6 @@ void account_steal_time(struct task_struct *p, cputime_t steal) | |||
4202 | 4202 | ||
4203 | if (p == rq->idle) { | 4203 | if (p == rq->idle) { |
4204 | p->stime = cputime_add(p->stime, steal); | 4204 | p->stime = cputime_add(p->stime, steal); |
4205 | account_group_system_time(p, steal); | ||
4206 | if (atomic_read(&rq->nr_iowait) > 0) | 4205 | if (atomic_read(&rq->nr_iowait) > 0) |
4207 | cpustat->iowait = cputime64_add(cpustat->iowait, tmp); | 4206 | cpustat->iowait = cputime64_add(cpustat->iowait, tmp); |
4208 | else | 4207 | else |
@@ -4338,7 +4337,7 @@ void __kprobes sub_preempt_count(int val) | |||
4338 | /* | 4337 | /* |
4339 | * Underflow? | 4338 | * Underflow? |
4340 | */ | 4339 | */ |
4341 | if (DEBUG_LOCKS_WARN_ON(val > preempt_count())) | 4340 | if (DEBUG_LOCKS_WARN_ON(val > preempt_count() - (!!kernel_locked()))) |
4342 | return; | 4341 | return; |
4343 | /* | 4342 | /* |
4344 | * Is the spinlock portion underflowing? | 4343 | * Is the spinlock portion underflowing? |