Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=51e296258cba41759ff0de5da110d8d52675ee67
Commit:     51e296258cba41759ff0de5da110d8d52675ee67
Parent:     d7e5117a2568f7407e98ca85155511ecfe4f0631
Author:     Jerone Young <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 26 08:33:53 2007 -0600
Committer:  Avi Kivity <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 17:53:15 2008 +0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
---
 include/linux/Kbuild |    2 +-
 include/linux/kvm.h  |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 27b9350..c263a69 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 b751552..f0bebd6 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;
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to