---

yaml --- r: 96918 b: refs/heads/master c: 021f4b6 h: refs/heads/master v: v3
git-mirror · May 18, 2008 · c9e3803 · c9e3803
1 parent 8d4a814
commit c9e3803
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eedaa4e2af681a266c084c410238855bdfbc2787
+refs/heads/master: 021f4b6cc966d02b2bcd68841bc2f0c4897edcbb
diff --git a/trunk/include/asm-ia64/kvm.h b/trunk/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];
 	};
 };