---

yaml --- r: 31183 b: refs/heads/master c: 9b47569 h: refs/heads/master i: 31181: 4e98cfa 31179: 0a8a060 31175: 33a4537 31167: 702dce6 v: v3
git-mirror · Jun 28, 2006 · 06dbcd1 · 06dbcd1
1 parent 34aa622
commit 06dbcd1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)