diff options
| author |   Xiantao Zhang <xiantao.zhang@intel.com> | 2008-05-07 17:37:32 +0800 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-05-18 14:34:16 +0300 |
| commit | 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb (patch) | |
| tree | 5d274261f7764e94fb13e45f886bc5c36c572cfa /include/asm-ia64 | |
| parent | KVM: PIT: take inject_pending into account when emulating hlt (diff) | |
| download | linux-dev-021f4b6cc966d02b2bcd68841bc2f0c4897edcbb.tar.xz linux-dev-021f4b6cc966d02b2bcd68841bc2f0c4897edcbb.zip | |
KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
The kernel's ia64_fpreg structure conflicts with userspace headers, so
define a new structure to replace it.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/kvm.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-ia64/kvm.h b/include/asm-ia64/kvm.h index eb2d3559d089..a1da4c465fb5 100644 --- a/include/asm-ia64/kvm.h +++ b/include/asm-ia64/kvm.h @@ -22,7 +22,6 @@ */ #include <asm/types.h> -#include <asm/fpu.h> #include <linux/ioctl.h> @@ -61,6 +60,13 @@ struct kvm_ioapic_state { #define KVM_CONTEXT_SIZE 8*1024 +struct kvm_fpreg { + union { + unsigned long bits[2]; + long double __dummy; /* force 16-byte alignment */ + } u; +}; + union context { /* 8K size */ char dummy[KVM_CONTEXT_SIZE]; @@ -77,7 +83,7 @@ union context { unsigned long ibr[8]; unsigned long dbr[8]; unsigned long pkr[8]; - struct ia64_fpreg fr[128]; + struct kvm_fpreg fr[128]; }; }; |