[PATCH] update asm-powerpc/time.h
From: Stephen Rothwell <hidden>
Date: 2006-06-28 01:52:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
If we ever build a combined kernel including iSeries, then this will be needed. Signed-off-by: Stephen Rothwell <redacted> --- include/asm-powerpc/time.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index 912118d..db8a57e 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h@@ -19,8 +19,9 @@ #include <linux/types.h> #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
@@ -178,7 +179,8 @@ #else #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)
--
1.3.3.g16a4