diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-21 12:40:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-21 12:40:56 -0700 |
| commit | 6f21d806f698a5c437dcae1f03e8dd73e3f5aab1 (patch) | |
| tree | 938273c283594304dc5a0e6d1efd32a1a87f4b19 | |
| parent | e59e14b6602a106c5f88b70264f814a987b2d7a4 (diff) | |
| parent | 9f7263236aa4401f8e52cae084f652175b7a7b5f (diff) | |
| download | op-kernel-dev-6f21d806f698a5c437dcae1f03e8dd73e3f5aab1.zip op-kernel-dev-6f21d806f698a5c437dcae1f03e8dd73e3f5aab1.tar.gz | |
Merge branch 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: ia64: 'struct fdesc' build fix
| -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 7a37d06..cd0d1a7 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; |
