diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-06-28 11:51:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-28 15:18:56 +1000 |
| commit | 9b47569a9d410199aea6386917fd0662809c60be (patch) | |
| tree | d9c59ba3d96db3a17c0356b683e4e7c67b3b2431 /include | |
| parent | 612f02d6d6eadd9c5dde5a5b97b55a3a620d28e5 (diff) | |
| download | kernel_samsung_espresso10-9b47569a9d410199aea6386917fd0662809c60be.zip kernel_samsung_espresso10-9b47569a9d410199aea6386917fd0662809c60be.tar.gz kernel_samsung_espresso10-9b47569a9d410199aea6386917fd0662809c60be.tar.bz2 | |
[POWERPC] update asm-powerpc/time.h
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/time.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index 4463148..dcde441 100644 --- a/include/asm-powerpc/time.h +++ b/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) |