Merge commit 'v2.6.30-rc6' into perfcounters/core

[mv-sheeva.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index a728976a3a6c914da36aeca990a4b7658ea60ebd..419a39d0988fd97ed18c6321a73896493eab2b8a 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4769,7 +4769,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
 
        if (user_tick)
                account_user_time(p, one_jiffy, one_jiffy_scaled);
-       else if (p != rq->idle)
+       else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET))
                account_system_time(p, HARDIRQ_OFFSET, one_jiffy,
                                    one_jiffy_scaled);
        else