Commit 9b47569a authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[POWERPC] update asm-powerpc/time.h

If we ever build a combined kernel including iSeries, then this will
be needed.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 612f02d6
...@@ -18,8 +18,9 @@ ...@@ -18,8 +18,9 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC_ISERIES
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/firmware.h>
#include <asm/iseries/hv_call.h> #include <asm/iseries/hv_call.h>
#endif #endif
...@@ -177,7 +178,8 @@ static inline void set_dec(int val) ...@@ -177,7 +178,8 @@ static inline void set_dec(int val)
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
int cur_dec; int cur_dec;
if (get_lppaca()->shared_proc) { if (firmware_has_feature(FW_FEATURE_ISERIES) &&
get_lppaca()->shared_proc) {
get_lppaca()->virtual_decr = val; get_lppaca()->virtual_decr = val;
cur_dec = get_dec(); cur_dec = get_dec();
if (cur_dec > val) if (cur_dec > val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment