leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg

Browse Source 
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>
This commit is contained in:
Xiantao Zhang 2008-05-07 17:37:32 +08:00 committed by Avi Kivity
parent eedaa4e2af
commit 021f4b6cc9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/asm-ia64/kvm.h
View File

@ -22,7 +22,6 @@
*/ */
#include <asm/types.h> #include <asm/types.h>
#include <asm/fpu.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
@ -61,6 +60,13 @@ struct kvm_ioapic_state {
#define KVM_CONTEXT_SIZE 8*1024 #define KVM_CONTEXT_SIZE 8*1024
struct kvm_fpreg {
union {
unsigned long bits[2];
long double __dummy; /* force 16-byte alignment */
} u;
};
union context { union context {
/* 8K size */ /* 8K size */
char dummy[KVM_CONTEXT_SIZE]; char dummy[KVM_CONTEXT_SIZE];
@ -77,7 +83,7 @@ union context {
unsigned long ibr[8]; unsigned long ibr[8];
unsigned long dbr[8]; unsigned long dbr[8];
unsigned long pkr[8]; unsigned long pkr[8];
struct ia64_fpreg fr[128]; struct kvm_fpreg fr[128];
}; };
}; };