[src/trunk]: src/sys/arch/powerpc/ibm4xx We cannot have DDB and IPKDB at the ...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75daa01865b4
branches:  trunk
changeset: 349865:75daa01865b4
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Dec 26 20:16:29 2016 +0000

description:
We cannot have DDB and IPKDB at the same time.

diffstat:

 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 34fc96a1cbe5 -r 75daa01865b4 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
--- a/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c  Mon Dec 26 19:46:59 2016 +0000
+++ b/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c  Mon Dec 26 20:16:29 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibm4xx_machdep.c,v 1.22 2016/12/22 14:47:58 cherry Exp $       */
+/*     $NetBSD: ibm4xx_machdep.c,v 1.23 2016/12/26 20:16:29 rin Exp $  */
 /*     Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
 
 /*
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.22 2016/12/22 14:47:58 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.23 2016/12/26 20:16:29 rin Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -134,8 +134,7 @@
 extern const uint32_t errata51handler[], errata51size;
 #if defined(DDB)
 extern const uint32_t ddblow[], ddbsize;
-#endif
-#if defined(IPKDB)
+#elif defined(IPKDB)
 extern const uint32_t ipkdblow[], ipkdbsize;
 #endif
 static const struct exc_info trap_table[] = {
@@ -152,8 +151,7 @@
                        errata51handler, (uintptr_t)&errata51size },
 #if defined(DDB)
        { EXC_PGM,      ddblow,         (uintptr_t)&ddbsize },
-#endif
-#if defined(IPKDB)
+#elif defined(IPKDB)
        { EXC_PGM,      ipkdblow,       (uintptr_t)&ipkdbsize },
 #endif
 };