From 06dbcd1ffdd1f12f97026d932967cdfa56146247 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Jun 2006 11:51:41 +1000
Subject: [PATCH] --- yaml --- r: 31183 b: refs/heads/master c:
 9b47569a9d410199aea6386917fd0662809c60be h: refs/heads/master i:   31181:
 4e98cfa57a74bdd2ff69bb878f4a6a5028fd8b7f   31179:
 0a8a06005439f3626152507bccb737cb5dd8c73a   31175:
 33a453706b262cfdffd725ee2ea74fdd09600c26   31167:
 702dce64c8024f295885f04936420416f4380cd6 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-powerpc/time.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 52d981e7aa10..89b026453e5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612f02d6d6eadd9c5dde5a5b97b55a3a620d28e5
+refs/heads/master: 9b47569a9d410199aea6386917fd0662809c60be
diff --git a/trunk/include/asm-powerpc/time.h b/trunk/include/asm-powerpc/time.h
index 4463148c659f..dcde4410348d 100644
--- a/trunk/include/asm-powerpc/time.h
+++ b/trunk/include/asm-powerpc/time.h
@@ -18,8 +18,9 @@
 #include <linux/percpu.h>
 
 #include <asm/processor.h>
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_ISERIES
 #include <asm/paca.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_call.h>
 #endif
 
@@ -177,7 +178,8 @@ static inline void set_dec(int val)
 #ifdef CONFIG_PPC_ISERIES
 	int cur_dec;
 
-	if (get_lppaca()->shared_proc) {
+	if (firmware_has_feature(FW_FEATURE_ISERIES) &&
+			get_lppaca()->shared_proc) {
 		get_lppaca()->virtual_decr = val;
 		cur_dec = get_dec();
 		if (cur_dec > val)