Module Name: src
Committed By: dyoung
Date: Tue May 17 17:42:47 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
Add some grotty #ifdef'age to make this compile w/o DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/e500_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.5 src/sys/arch/powerpc/booke/e500_intr.c:1.6
--- src/sys/arch/powerpc/booke/e500_intr.c:1.5 Mon Mar 21 19:55:04 2011
+++ src/sys/arch/powerpc/booke/e500_intr.c Tue May 17 17:42:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.5 2011/03/21 19:55:04 matt Exp $ */
+/* $NetBSD: e500_intr.c,v 1.6 2011/05/17 17:42:46 dyoung Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -504,7 +504,9 @@
u_int ctpr = (ipl >= IPL_VM ? 15 : ipl);
KASSERT(openpic_read(cpu, OPENPIC_CTPR) == old_ctpr);
#else
+#ifdef DIAGNOSTIC
u_int old_ctpr = IPL2CTPR(ci->ci_cpl);
+#endif
u_int ctpr = IPL2CTPR(ipl);
KASSERT(openpic_read(cpu, OPENPIC_CTPR) == old_ctpr);
#endif
@@ -908,7 +910,9 @@
__func__, tf, __LINE__, old_ipl,
15 - IPL_HIGH, openpic_read(cpu, OPENPIC_CTPR));
const uint32_t iack = openpic_read(cpu, OPENPIC_IACK);
+#ifdef DIAGNOSTIC
const int ipl = iack & 0xf;
+#endif
const int irq = (iack >> 4) - 1;
#if 0
printf("%s: iack=%d ipl=%d irq=%d <%s>\n",
