Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -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;