]> err.no Git - linux-2.6/commitdiff
KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
authorXiantao Zhang <xiantao.zhang@intel.com>
Wed, 7 May 2008 09:37:32 +0000 (17:37 +0800)
committerAvi Kivity <avi@qumranet.com>
Sun, 18 May 2008 11:34:16 +0000 (14:34 +0300)
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>
include/asm-ia64/kvm.h

index eb2d3559d089a52c24d7df5cecc1bf0b82cccdab..a1da4c465fb59a0611291b9262c30f8e80efafa2 100644 (file)
@@ -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];
        };
 };