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

[linux-2.6-block.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 748ff924a29056e57f5c30058ce39ea7e470b23e..22aa9cab3fe5b350f38aa86d596325adf486382c 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4192,7 +4192,6 @@ void account_steal_time(struct task_struct *p, cputime_t steal)
 
        if (p == rq->idle) {
                p->stime = cputime_add(p->stime, steal);
-               account_group_system_time(p, steal);
                if (atomic_read(&rq->nr_iowait) > 0)
                        cpustat->iowait = cputime64_add(cpustat->iowait, tmp);
                else
@@ -4328,7 +4327,7 @@ void __kprobes sub_preempt_count(int val)
        /*
         * Underflow?
         */
-       if (DEBUG_LOCKS_WARN_ON(val > preempt_count()))
+       if (DEBUG_LOCKS_WARN_ON(val > preempt_count() - (!!kernel_locked())))
                return;
        /*
         * Is the spinlock portion underflowing?