mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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>
This commit is contained in:
parent
d7e5117a25
commit
51e296258c
2 changed files with 3 additions and 1 deletions
|
@ -100,7 +100,6 @@ header-y += iso_fs.h
|
||||||
header-y += ixjuser.h
|
header-y += ixjuser.h
|
||||||
header-y += jffs2.h
|
header-y += jffs2.h
|
||||||
header-y += keyctl.h
|
header-y += keyctl.h
|
||||||
header-y += kvm.h
|
|
||||||
header-y += limits.h
|
header-y += limits.h
|
||||||
header-y += lock_dlm_plock.h
|
header-y += lock_dlm_plock.h
|
||||||
header-y += magic.h
|
header-y += magic.h
|
||||||
|
@ -256,6 +255,7 @@ unifdef-y += kd.h
|
||||||
unifdef-y += kernelcapi.h
|
unifdef-y += kernelcapi.h
|
||||||
unifdef-y += kernel.h
|
unifdef-y += kernel.h
|
||||||
unifdef-y += keyboard.h
|
unifdef-y += keyboard.h
|
||||||
|
unifdef-y += kvm.h
|
||||||
unifdef-y += llc.h
|
unifdef-y += llc.h
|
||||||
unifdef-y += loop.h
|
unifdef-y += loop.h
|
||||||
unifdef-y += lp.h
|
unifdef-y += lp.h
|
||||||
|
|
|
@ -51,8 +51,10 @@ struct kvm_irqchip {
|
||||||
__u32 pad;
|
__u32 pad;
|
||||||
union {
|
union {
|
||||||
char dummy[512]; /* reserving space */
|
char dummy[512]; /* reserving space */
|
||||||
|
#ifdef CONFIG_X86
|
||||||
struct kvm_pic_state pic;
|
struct kvm_pic_state pic;
|
||||||
struct kvm_ioapic_state ioapic;
|
struct kvm_ioapic_state ioapic;
|
||||||
|
#endif
|
||||||
} chip;
|
} chip;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue