commit e858e8b07666e96c7206f3c42d233340156ebf0a
author Linus Torvalds <torvalds@linux-foundation.org> Tue May 05 12:08:40 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue May 05 12:08:40 2009 -0700
tree c03420c9d8d9606d4f8b06bd280646528af8f4b1
parent da87bbd14299ef43848742c44dfe05fa1da5a21f
parent f5f293a4e3d0a0c52cec31de6762c95050156516

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: account system time properly

kernel/sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index b902e58..26efa47 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4732,7 +4732,7 @@
 
 	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