diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:28 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:28 -0700 |
| commit | 22ca532a4d137545244fdff0b687325fd4e13eae (patch) | |
| tree | 459f5116344c71d13d860f4fd9f0c2c477df268a /arch/ia64/kernel/paravirt_inst.h | |
| parent | 9224652cc76417bfe779bcdb1243cf0b083e3eee (diff) | |
| parent | f8d1f99f3958c46cdc983743d75d0b31b9accb80 (diff) | |
| download | blackbird-op-linux-22ca532a4d137545244fdff0b687325fd4e13eae.tar.gz blackbird-op-linux-22ca532a4d137545244fdff0b687325fd4e13eae.zip | |
Pull pv_ops-xen into release branch
Diffstat (limited to 'arch/ia64/kernel/paravirt_inst.h')
| -rw-r--r-- | arch/ia64/kernel/paravirt_inst.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/kernel/paravirt_inst.h b/arch/ia64/kernel/paravirt_inst.h index 5cad6fb2ed19..64d6d810c64b 100644 --- a/arch/ia64/kernel/paravirt_inst.h +++ b/arch/ia64/kernel/paravirt_inst.h @@ -20,7 +20,9 @@ * */ -#ifdef __IA64_ASM_PARAVIRTUALIZED_XEN +#ifdef __IA64_ASM_PARAVIRTUALIZED_PVCHECK +#include <asm/native/pvchk_inst.h> +#elif defined(__IA64_ASM_PARAVIRTUALIZED_XEN) #include <asm/xen/inst.h> #include <asm/xen/minstate.h> #else |
