Skip to content

Commit

Permalink
Merge branch 'kvm-updates/2.6.27' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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
  • Loading branch information
Linus Torvalds committed Sep 21, 2008
2 parents e59e14b + 9f72632 commit 6f21d80
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/ia64/kvm/kvm-ia64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
Expand Down

0 comments on commit 6f21d80

Please sign in to comment.