[patch] kvm/ia64 build fix

[patch] kvm/ia64 build fix

[Jes Sorensen]

[-- Attachment #1: Type: text/plain, Size: 96 bytes --]

Hi,

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

Cheers,
Jes


[-- Attachment #2: 0200-ia64-kvm-build-fix.patch --]
[-- Type: text/plain, Size: 817 bytes --]

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

Fixes build problem.

Signed-off-by: Jes Sorensen <jes@sgi.com>

---
 arch/ia64/kvm/kvm-ia64.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Index: linux-2.6.git/arch/ia64/kvm/kvm-ia64.c
===================================================================
--- linux-2.6.git.orig/arch/ia64/kvm/kvm-ia64.c
+++ 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;

RE: [patch] kvm/ia64 build fix

[Luck, Tony]

> 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:

Acked-by: Tony Luck <tony.luck@intel.com>

-Tony

Re: [patch] kvm/ia64 build fix

[Avi Kivity]

Jes Sorensen wrote:
> Hi,
>
> This is needed against Linus' current tree to avoid a struct redefine
> error.
>

Applied, thanks.  Will queue for 2.6.27.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.