aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerone Young <jyoung5@us.ibm.com>2007-11-26 09:33:53 -0500
committerAvi Kivity <avi@qumranet.com>2008-01-30 10:53:15 -0500
commit51e296258cba41759ff0de5da110d8d52675ee67 (patch)
tree97675b88559d9bab5674fb2c497be17e0b7d5be9
parentd7e5117a2568f7407e98ca85155511ecfe4f0631 (diff)
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>
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/kvm.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 27b9350052b4..c263a69b5680 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -100,7 +100,6 @@ header-y += iso_fs.h
100header-y += ixjuser.h 100header-y += ixjuser.h
101header-y += jffs2.h 101header-y += jffs2.h
102header-y += keyctl.h 102header-y += keyctl.h
103header-y += kvm.h
104header-y += limits.h 103header-y += limits.h
105header-y += lock_dlm_plock.h 104header-y += lock_dlm_plock.h
106header-y += magic.h 105header-y += magic.h
@@ -256,6 +255,7 @@ unifdef-y += kd.h
256unifdef-y += kernelcapi.h 255unifdef-y += kernelcapi.h
257unifdef-y += kernel.h 256unifdef-y += kernel.h
258unifdef-y += keyboard.h 257unifdef-y += keyboard.h
258unifdef-y += kvm.h
259unifdef-y += llc.h 259unifdef-y += llc.h
260unifdef-y += loop.h 260unifdef-y += loop.h
261unifdef-y += lp.h 261unifdef-y += lp.h
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index b751552f2e30..f0bebd61ff77 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -51,8 +51,10 @@ struct kvm_irqchip {
51 __u32 pad; 51 __u32 pad;
52 union { 52 union {
53 char dummy[512]; /* reserving space */ 53 char dummy[512]; /* reserving space */
54#ifdef CONFIG_X86
54 struct kvm_pic_state pic; 55 struct kvm_pic_state pic;
55 struct kvm_ioapic_state ioapic; 56 struct kvm_ioapic_state ioapic;
57#endif
56 } chip; 58 } chip;
57}; 59};
58 60