diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-06-11 17:47:49 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-06-11 17:47:49 +0100 |
| commit | 5536c6247b0bb424535e31d125aeafd7e93e226a (patch) | |
| tree | c378ae7710c7aeff327d5cc4d87a5d06da986973 /xen/arch/x86/hvm/vlapic.c | |
| parent | 6f394524c2ac1db90e03ad67d4b1c71885e95699 (diff) | |
| download | xen-5536c6247b0bb424535e31d125aeafd7e93e226a.tar.gz xen-5536c6247b0bb424535e31d125aeafd7e93e226a.tar.bz2 xen-5536c6247b0bb424535e31d125aeafd7e93e226a.zip | |
x86: Do not include apic.h/io_apic.h from asm/smp.h
...and fix up the ensuing fall-out of implicit dependencies
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/vlapic.c')
| -rw-r--r-- | xen/arch/x86/hvm/vlapic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index ad0e0ceca7..da513de052 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -31,6 +31,8 @@ #include <xen/numa.h> #include <asm/current.h> #include <asm/page.h> +#include <asm/apic.h> +#include <asm/io_apic.h> #include <asm/hvm/hvm.h> #include <asm/hvm/io.h> #include <asm/hvm/support.h> @@ -803,6 +805,12 @@ int vlapic_ack_pending_irq(struct vcpu *v, int vector) return 1; } +bool_t is_vlapic_lvtpc_enabled(struct vlapic *vlapic) +{ + return (vlapic_enabled(vlapic) && + !(vlapic_get_reg(vlapic, APIC_LVTPC) & APIC_LVT_MASKED)); +} + /* Reset the VLPAIC back to its power-on/reset state. */ void vlapic_reset(struct vlapic *vlapic) { |