diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-05-01 11:34:56 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-05-01 11:34:56 +0100 |
commit | b81f8a02e719ea650d3f87edd4c75cdb686df728 (patch) | |
tree | 6f714cabc7890ed7fe662ecbeb75be0640e59677 /xen/arch/x86/nmi.c | |
parent | 6176d3cd0bab4b90736e73da2db80e8aeb7f5e1d (diff) | |
download | xen-b81f8a02e719ea650d3f87edd4c75cdb686df728.tar.gz xen-b81f8a02e719ea650d3f87edd4c75cdb686df728.tar.bz2 xen-b81f8a02e719ea650d3f87edd4c75cdb686df728.zip |
x86: Support x2APIC mode.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'xen/arch/x86/nmi.c')
-rw-r--r-- | xen/arch/x86/nmi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index ad83f8beb3..7b69e71264 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -434,14 +434,13 @@ void nmi_watchdog_tick(struct cpu_user_regs * regs) */ static void do_nmi_trigger(unsigned char key) { - u32 id = GET_APIC_ID(apic_read(APIC_ID)); + u32 id = get_apic_id(); printk("Triggering NMI on APIC ID %x\n", id); local_irq_disable(); apic_wait_icr_idle(); - apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(id)); - apic_write_around(APIC_ICR, APIC_DM_NMI | APIC_DEST_PHYSICAL); + apic_icr_write(APIC_DM_NMI | APIC_DEST_PHYSICAL, id); local_irq_enable(); } |