Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/eisa/eisa_machdep.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/eisa/eisa_machdep.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.39
retrieving revision 1.39.6.1
diff -u -p -r1.39 -r1.39.6.1
--- src/sys/arch/i386/eisa/eisa_machdep.c	2014/03/29 19:28:28	1.39
+++ src/sys/arch/i386/eisa/eisa_machdep.c	2015/06/06 14:40:00	1.39.6.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: eisa_machdep.c,v 1.39 2014/03/29 19:28:28 christos Exp $	*/
+/*	$NetBSD: eisa_machdep.c,v 1.39.6.1 2015/06/06 14:40:00 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.39 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.39.6.1 2015/06/06 14:40:00 skrll Exp $");
 
 #include "ioapic.h"
 
@@ -160,19 +160,19 @@ const char *
 eisa_intr_string(eisa_chipset_tag_t ec, eisa_intr_handle_t ih, char *buf,
     size_t len)
 {
-	if (ih == 0 || (ih & 0xff) >= NUM_LEGACY_IRQS || ih == 2)
-		panic("eisa_intr_string: bogus handle 0x%x", ih);
+	if (ih == 0 || APIC_IRQ_LEGACY_IRQ(ih) >= NUM_LEGACY_IRQS || ih == 2)
+		panic("eisa_intr_string: bogus handle 0x%" PRIx64, ih);
 
 #if NIOAPIC > 0
 	if (ih & APIC_INT_VIA_APIC)
 		snprintf(buf, len, "apic %d int %d (irq %d)",
 		    APIC_IRQ_APIC(ih),
 		    APIC_IRQ_PIN(ih),
-		    ih&0xff);
+		    APIC_IRQ_LEGACY_IRQ(ih));
 	else
-		snprintf(buf, len, "irq %d", ih&0xff);
+		snprintf(buf, len, "irq %d",  APIC_IRQ_LEGACY_IRQ(ih));
 #else
-	snprintf(buf, len, "irq %d", ih);
+	snprintf(buf, len, "irq %d", APIC_IRQ_LEGACY_IRQ(ih));
 #endif
 	return buf;
 }