tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e858e8b0 da87bbd1

+1 -1
unified split
+1 -1
kernel/sched.c
··· 4732 4732 4733 4733 if (user_tick) 4734 4734 account_user_time(p, one_jiffy, one_jiffy_scaled); 4735 - else if (p != rq->idle) 4735 + else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET)) 4736 4736 account_system_time(p, HARDIRQ_OFFSET, one_jiffy, 4737 4737 one_jiffy_scaled); 4738 4738 else