Skip to contentSkip to conversation

kvm/ia64 build fix

PATCH Applied Jes Sorensen 3 participants 3 messages Sep 12, 2008 – Sep 17, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvm/ia64 build fix

Hi,

This is needed against Linus' current tree to avoid a struct redefine error.

Cheers,
Jes

Rely on struct fdisc from asm/elf.h to define the ia64 function pointer layout - no need to duplicate locally.

Fixes build problem.

---
 arch/ia64/kvm/kvm-ia64.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/ia64/kvm/kvm-ia64.c +1 -6
Index: linux-2.6.git/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 @@
 	{ NULL }
 };
 
-
-struct fdesc{
-    unsigned long ip;
-    unsigned long gp;
-};
-
 static void kvm_flush_icache(unsigned long start, unsigned long len)
 {
 	int l;
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines

This is needed against Linus' current tree to avoid a struct redefine error.

Drat! I noticed that kvm had cloned the definition of struct fdesc when chatting with James on IRC about this, but forgot to check a CONFIG_KVM build when testing his patch.

Avi: Will you apply this and send to Linus? If so here's an:

-Tony

Applied
#2 lore raw
In reply to Jes Sorensen
Quoted 5 lines · Jes Sorensen

Hi,

This is needed against Linus' current tree to avoid a struct redefine error.

Applied, thanks. Will queue for 2.6.27.

Signature · 2 lines
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.