From: Peter Dinda <pdinda@apu.cs.unm.edu>
Date: Wed, 25 Mar 2009 22:27:17 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=8c06d37e4eb0083519402c0188210a3f0f3538d1;hp=b3b88c98e70d7413fcf5220af2018766190997ac

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index a26f231..7424b55 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -341,12 +341,12 @@ static int apic_do_eoi(struct apic_state * apic) {
 
 #ifdef CRAY_XT
 	
-	if ((((i * 8) + j) == 238) || 
-	    (((i * 8) + j) == 239)) {
-	    PrintError("Acking IRQ %d\n", ((i * 8) + j));
+	if ((isr_irq == 238) || 
+	    (isr_irq == 239)) {
+	    PrintError("Acking IRQ %d\n", isr_irq);
 	}
 	
-	if (((i * 8) + j) == 238) {
+	if (isr_irq == 238) {
 	    V3_ACK_IRQ(238);
 	}
 #endif