diff options
| author |   Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 14:25:08 -0700 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2009-03-31 14:25:08 -0700 |
| commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
| tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/include/asm/intrinsics.h | |
| parent | Pull cpumask into release branch (diff) | |
| parent | ia64: remove some warnings. (diff) | |
| download | linux-dev-c66b31f3926165bc1d4128adc97a064dcbab421a.tar.xz linux-dev-c66b31f3926165bc1d4128adc97a064dcbab421a.zip | |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/include/asm/intrinsics.h')
| -rw-r--r-- | arch/ia64/include/asm/intrinsics.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h index c47830e26cb7..111ed5222892 100644 --- a/arch/ia64/include/asm/intrinsics.h +++ b/arch/ia64/include/asm/intrinsics.h @@ -202,7 +202,11 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void); #ifndef __ASSEMBLY__ #if defined(CONFIG_PARAVIRT) && defined(__KERNEL__) -#define IA64_INTRINSIC_API(name) pv_cpu_ops.name +#ifdef ASM_SUPPORTED +# define IA64_INTRINSIC_API(name) paravirt_ ## name +#else +# define IA64_INTRINSIC_API(name) pv_cpu_ops.name +#endif #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name #else #define IA64_INTRINSIC_API(name) ia64_native_ ## name |