Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern Try to fix the build: avoid duplicate case labels w...
details: https://anonhg.NetBSD.org/src/rev/9816aecea86a
branches: trunk
changeset: 829477:9816aecea86a
user: martin <martin%NetBSD.org@localhost>
date: Sat Feb 03 11:30:01 2018 +0000
description:
Try to fix the build: avoid duplicate case labels when IPL_SOFT* are
all the same.
diffstat:
sys/kern/subr_xcall.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (33 lines):
diff -r bca022aae808 -r 9816aecea86a sys/kern/subr_xcall.c
--- a/sys/kern/subr_xcall.c Sat Feb 03 08:52:52 2018 +0000
+++ b/sys/kern/subr_xcall.c Sat Feb 03 11:30:01 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_xcall.c,v 1.21 2018/02/01 03:15:29 ozaki-r Exp $ */
+/* $NetBSD: subr_xcall.c,v 1.22 2018/02/03 11:30:01 martin 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.21 2018/02/01 03:15:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.22 2018/02/03 11:30:01 martin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -186,10 +186,14 @@
return __SHIFTIN(XC_IPL_SOFTSERIAL, XC_IPL_MASK);
case IPL_SOFTBIO:
return __SHIFTIN(XC_IPL_SOFTBIO, XC_IPL_MASK);
+#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);
Home |
Main Index |
Thread Index |
Old Index