Skip to content

Commit

Permalink
[POWERPC] update asm-powerpc/time.h
Browse files Browse the repository at this point in the history
If we ever build a combined kernel including iSeries, then this will
be needed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Jun 28, 2006
1 parent 612f02d commit 9b47569
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions include/asm-powerpc/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 9b47569

Please sign in to comment.