[src/trunk]: src/sys/kern Fix build of kernels that some (or all) IPL_SOFT* s...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b545c57b6e56
branches:  trunk
changeset: 829522:b545c57b6e56
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Feb 05 02:49:46 2018 +0000

description:
Fix build of kernels that some (or all) IPL_SOFT* share a value (e.g., mips)

diffstat:

 sys/kern/subr_xcall.c |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 25e1422df15e -r b545c57b6e56 sys/kern/subr_xcall.c
--- a/sys/kern/subr_xcall.c     Mon Feb 05 00:43:06 2018 +0000
+++ b/sys/kern/subr_xcall.c     Mon Feb 05 02:49:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_xcall.c,v 1.22 2018/02/03 11:30:01 martin Exp $   */
+/*     $NetBSD: subr_xcall.c,v 1.23 2018/02/05 02:49:46 ozaki-r Exp $  */
 
 /*-
  * Copyright (c) 2007-2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.22 2018/02/03 11:30:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.23 2018/02/05 02:49:46 ozaki-r Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -184,16 +184,19 @@
        switch (ipl) {
        case IPL_SOFTSERIAL:
                return __SHIFTIN(XC_IPL_SOFTSERIAL, XC_IPL_MASK);
+       /* IPL_SOFT* can be the same value (e.g., on sparc or mips). */
+#if IPL_SOFTNET != IPL_SOFTSERIAL
+       case IPL_SOFTNET:
+               return __SHIFTIN(XC_IPL_SOFTNET, XC_IPL_MASK);
+#endif
+#if IPL_SOFTBIO != IPL_SOFTNET
        case IPL_SOFTBIO:
                return __SHIFTIN(XC_IPL_SOFTBIO, XC_IPL_MASK);
+#endif
 #if IPL_SOFTCLOCK != IPL_SOFTBIO
        case IPL_SOFTCLOCK:
                return __SHIFTIN(XC_IPL_SOFTCLOCK, XC_IPL_MASK);
 #endif
-#if IPL_SOFTNET != IPL_SOFTBIO
-       case IPL_SOFTNET:
-               return __SHIFTIN(XC_IPL_SOFTNET, XC_IPL_MASK);
-#endif
        }
 
        panic("Invalid IPL: %d", ipl);