diff options
| author | Jes Sorensen <jes@sgi.com> | 2008-09-12 14:12:08 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-09-20 01:49:01 +0200 |
| commit | 9f7263236aa4401f8e52cae084f652175b7a7b5f (patch) | |
| tree | 48910c5b4c1d2d068052b94dc4d293aa8380a243 /arch/ia64/kvm/kvm-ia64.c | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| download | linux-9f7263236aa4401f8e52cae084f652175b7a7b5f.tar.xz linux-9f7263236aa4401f8e52cae084f652175b7a7b5f.zip | |
KVM: ia64: 'struct fdesc' build fix
Commit 4611a77 ("[IA64] fix compile failure with non modular builds")
introduced struct fdesc into asm/elf.h, which duplicates KVM's definition.
Remove the latter to avoid the build error.
Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 7a37d06376be..cd0d1a7284b7 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -38,6 +38,7 @@ #include <asm/cacheflush.h> #include <asm/div64.h> #include <asm/tlb.h> +#include <asm/elf.h> #include "misc.h" #include "vti.h" @@ -61,12 +62,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { { NULL } }; - -struct fdesc{ - unsigned long ip; - unsigned long gp; -}; - static void kvm_flush_icache(unsigned long start, unsigned long len) { int l; |