diff options
| author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:25:08 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:25:08 -0400 |
| commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
| tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/include/asm/intrinsics.h | |
| parent | 50fbe56c127efde659c686495eb1f925fd84ff0a (diff) | |
| parent | 7120569c76028a6883697b7643564f0c419cfe07 (diff) | |
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); | |||
| 202 | 202 | ||
| 203 | #ifndef __ASSEMBLY__ | 203 | #ifndef __ASSEMBLY__ |
| 204 | #if defined(CONFIG_PARAVIRT) && defined(__KERNEL__) | 204 | #if defined(CONFIG_PARAVIRT) && defined(__KERNEL__) |
| 205 | #define IA64_INTRINSIC_API(name) pv_cpu_ops.name | 205 | #ifdef ASM_SUPPORTED |
| 206 | # define IA64_INTRINSIC_API(name) paravirt_ ## name | ||
| 207 | #else | ||
| 208 | # define IA64_INTRINSIC_API(name) pv_cpu_ops.name | ||
| 209 | #endif | ||
| 206 | #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name | 210 | #define IA64_INTRINSIC_MACRO(name) paravirt_ ## name |
| 207 | #else | 211 | #else |
| 208 | #define IA64_INTRINSIC_API(name) ia64_native_ ## name | 212 | #define IA64_INTRINSIC_API(name) ia64_native_ ## name |