From: Jerone Young <jyoung5@us.ibm.com>
Date: Mon, 26 Nov 2007 14:33:53 +0000 (-0600)
Subject: KVM: Add ifdef in irqchip struct for x86 only structures
X-Git-Tag: v2.6.25-rc1~1138^2~78
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=51e296258cba41759ff0de5da110d8d52675ee67;p=linux-2.6-omap-h63xx.git

KVM: Add ifdef in irqchip struct for x86 only structures

This patch fixes a small issue where sturctures:
	kvm_pic_state
	kvm_ioapic_state

are defined inside x86 specific code and may or may not
be defined in anyway for other architectures. The problem
caused is one cannot compile userspace apps (ex. libkvm)
for other archs since a size cannot be determined for these
structures.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 27b9350052b..c263a69b568 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -100,7 +100,6 @@ header-y += iso_fs.h
 header-y += ixjuser.h
 header-y += jffs2.h
 header-y += keyctl.h
-header-y += kvm.h
 header-y += limits.h
 header-y += lock_dlm_plock.h
 header-y += magic.h
@@ -256,6 +255,7 @@ unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
+unifdef-y += kvm.h
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index b751552f2e3..f0bebd61ff7 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -51,8 +51,10 @@ struct kvm_irqchip {
 	__u32 pad;
         union {
 		char dummy[512];  /* reserving space */
+#ifdef CONFIG_X86
 		struct kvm_pic_state pic;
 		struct kvm_ioapic_state ioapic;
+#endif
 	} chip;
 };