From ad9ed421ac852fc3d3d0f6175a108befb6d33374 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sun, 20 Mar 2011 15:28:03 +0000
Subject: [PATCH] --- yaml --- r: 243519 b: refs/heads/master c:
 ad5d1c888e556bc00c4e86f452cad4a3a87d22c1 h: refs/heads/master i:   243517:
 ce0a502241721a948fb14f6c8b5cd7424dd243e5   243515:
 d278f164473a9c4cd77281f2e1120ac371e9fb4c   243511:
 fc3e0f7c1c59dfc12698a1370685ca65378d5d97   243503:
 91dfba6f878e21c1492885c385e37937718b2ebb   243487:
 991c1888cfea1bdd2426f3390467a2159914ba8d   243455:
 52c587e01eb751a345b56d240978782d066c9698 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 184ff27f4e67..202a93569376 100644
--- 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
index 09d31dbf43f9..aa9269600ca2 100644
--- 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);