Sat Feb 3 11:30:01 2018 UTC ()

Try to fix the build: avoid duplicate case labels when IPL_SOFT* are
all the same.


(martin)

diff -r1.21 -r1.22 src/sys/kern/subr_xcall.c

--- src/sys/kern/subr_xcall.c 2018/02/01 03:15:29	1.21
+++ src/sys/kern/subr_xcall.c 2018/02/03 11:30:01	1.22

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -64,27 +64,27 @@
  *	CPU, and so has exclusive access to the CPU.  Since this facility
  *	is heavyweight, it's expected that it will not be used often.
+ *
  *	Cross calls must not allocate memory, as the pagedaemon uses
  *	them (and memory allocation may need to wait on the pagedaemon).
+ *
  *	A low-overhead mechanism for high priority calls (XC_HIGHPRI) is
  *	also provided.  The function to be executed runs on a software
  *	interrupt context, at IPL_SOFTSERIAL level, and is expected to
  *	be very lightweight, e.g. avoid blocking.
  */
 #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>
 #include <sys/xcall.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/evcnt.h>
 #include <sys/kthread.h>
 #include <sys/cpu.h>
 #ifdef _RUMPKERNEL
 #include "rump_private.h"
 #endif
 @@ -176,30 +176,34 @@ xc_init(void)
 /*
  * Encode an IPL to a form that can be embedded into flags of xc_broadcast
  * or xc_unicast.
  */
 unsigned int
 xc_encode_ipl(int ipl)
+{
 	switch (ipl) {
 	case IPL_SOFTSERIAL:
 		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);
+}
 /*
  * Extract an XC_IPL from flags of xc_broadcast or xc_unicast.
  */
 static inline unsigned int
 xc_extract_ipl(unsigned int flags)
+{
 	return __SHIFTOUT(flags, XC_IPL_MASK);