From 9b681c8f1c877f2462e9d41f8f138640c7190681 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 16 May 2012 19:03:25 +0300 Subject: [PATCH] --- yaml --- r: 305019 b: refs/heads/master c: c8f64bf7df9e4858c051b6c1c09582359b97677d h: refs/heads/master i: 305017: 8974f9a8dbf1c622669b3c5ec4ebdec1f94fed20 305015: 7c2f489ce669a9f7d068a5904ed7958af523dc89 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/apicdef.h | 2 +- trunk/arch/x86/platform/visws/visws_quirks.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1932d8215011..4f14398a9599 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87e4baacaeba098e217b14e9d2f6af428fe3f657 +refs/heads/master: c8f64bf7df9e4858c051b6c1c09582359b97677d diff --git a/trunk/arch/x86/include/asm/apicdef.h b/trunk/arch/x86/include/asm/apicdef.h index 134bba00df09..c46bb99d5fb2 100644 --- a/trunk/arch/x86/include/asm/apicdef.h +++ b/trunk/arch/x86/include/asm/apicdef.h @@ -37,7 +37,7 @@ #define APIC_ARBPRI_MASK 0xFFu #define APIC_PROCPRI 0xA0 #define APIC_EOI 0xB0 -#define APIC_EIO_ACK 0x0 +#define APIC_EOI_ACK 0x0 /* Docs say 0 for future compat. */ #define APIC_RRR 0xC0 #define APIC_LDR 0xD0 #define APIC_LDR_MASK (0xFFu << 24) diff --git a/trunk/arch/x86/platform/visws/visws_quirks.c b/trunk/arch/x86/platform/visws/visws_quirks.c index c7abf13a213f..94d8a39332ec 100644 --- a/trunk/arch/x86/platform/visws/visws_quirks.c +++ b/trunk/arch/x86/platform/visws/visws_quirks.c @@ -445,7 +445,7 @@ static void ack_cobalt_irq(struct irq_data *data) spin_lock_irqsave(&cobalt_lock, flags); disable_cobalt_irq(data); - apic_write(APIC_EOI, APIC_EIO_ACK); + apic_write(APIC_EOI, APIC_EOI_ACK); spin_unlock_irqrestore(&cobalt_lock, flags); }