From 74b5057216ce68c1e505b3110e2a2dc0b9f1b505 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Fri, 14 Dec 2007 15:52:19 +1100
Subject: [PATCH] --- yaml --- r: 81099 b: refs/heads/master c:
 db3801a858e97adee0f3b4c732e6ff325d95e0a5 h: refs/heads/master i:   81097:
 7acb10683a87725878670d30d92f6112ba70af35   81095:
 ceb88087ffe11652139f189bba25053f5cb8dd35 v: v3

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

diff --git a/[refs] b/[refs]
index 2215be8f317d..14a1ebf64d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6b44e8223a01d35fceec3631be356fbdbcf004
+refs/heads/master: db3801a858e97adee0f3b4c732e6ff325d95e0a5
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index 5cf394080590..398cd0c7b60f 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/arch/powerpc/kernel/time.c
@@ -329,11 +329,9 @@ void calculate_steal_time(void)
 	s64 stolen;
 	struct cpu_purr_data *pme;
 
-	if (!cpu_has_feature(CPU_FTR_PURR))
-		return;
 	pme = &__get_cpu_var(cpu_purr_data);
 	if (!pme->initialized)
-		return;		/* this can happen in early boot */
+		return;		/* !CPU_FTR_PURR or early in early boot */
 	tb = mftb();
 	purr = mfspr(SPRN_PURR);
 	stolen = (tb - pme->tb) - (purr - pme->purr);