---

yaml --- r: 80793 b: refs/heads/master c: 51e2962 h: refs/heads/master i: 80791: 05fb60f v: v3
git-mirror · Jan 30, 2008 · a3f4194 · a3f4194
1 parent f93b195
commit a3f4194
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e5117a2568f7407e98ca85155511ecfe4f0631
+refs/heads/master: 51e296258cba41759ff0de5da110d8d52675ee67
diff --git a/trunk/include/linux/Kbuild b/trunk/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/trunk/include/linux/kvm.h b/trunk/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;
 };