Commit 6f21d806 authored by Linus Torvalds's avatar Linus Torvalds

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
parents e59e14b6 9f726323
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/elf.h>
#include "misc.h" #include "misc.h"
#include "vti.h" #include "vti.h"
...@@ -61,12 +62,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { ...@@ -61,12 +62,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
{ NULL } { NULL }
}; };
struct fdesc{
unsigned long ip;
unsigned long gp;
};
static void kvm_flush_icache(unsigned long start, unsigned long len) static void kvm_flush_icache(unsigned long start, unsigned long len)
{ {
int l; int l;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment