---

yaml --- r: 243519 b: refs/heads/master c: ad5d1c8 h: refs/heads/master i: 243517: ce0a502 243515: d278f16 243511: fc3e0f7 243503: 91dfba6 243487: 991c188 243455: 52c587e v: v3
git-mirror · Mar 29, 2011 · ad9ed42 · ad9ed42
1 parent a9539b7
commit ad9ed42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d86938a4eacb4acf5c4466171ea577d7b8dc4d4
+refs/heads/master: ad5d1c888e556bc00c4e86f452cad4a3a87d22c1
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
@@ -356,7 +356,7 @@ void account_system_vtime(struct task_struct *tsk)
 	}
 	get_paca()->user_time_scaled += user_scaled;
 
-	if (in_irq() || idle_task(smp_processor_id()) != tsk) {
+	if (in_interrupt() || idle_task(smp_processor_id()) != tsk) {
 		account_system_time(tsk, 0, delta, sys_scaled);
 		if (stolen)
 			account_steal_time(stolen);