Module Name: src
Committed By: martin
Date: Fri Nov 22 14:30:58 UTC 2019
Modified Files:
src/sys/arch/arm/omap: obio_mputmr.c
src/sys/arch/evbarm/beagle: beagle_machdep.c
src/sys/arch/xen/xen: xenevt.c
Log Message:
Make this files compilable w/o options DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/omap/obio_mputmr.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/xen/xen/xenevt.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/arm/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.8 src/sys/arch/arm/omap/obio_mputmr.c:1.9
--- src/sys/arch/arm/omap/obio_mputmr.c:1.8 Sun Jun 16 17:47:54 2013
+++ src/sys/arch/arm/omap/obio_mputmr.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.9 2019/11/22 14:30:58 martin Exp $ */
/*
* Based on omap_mputmr.c
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.9 2019/11/22 14:30:58 martin Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -302,9 +302,9 @@ gpt_enable(
#if defined(OMAP_2430) || defined(OMAP_2420)
bus_space_handle_t ioh;
- uint32_t r;
+ uint32_t r, err __diagused;
- int err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
+ err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
OMAP2_CM_SIZE, 0, &ioh);
KASSERT(err == 0);
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.79
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.79 2019/11/22 14:30:58 martin Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.79 2019/11/22 14:30:58 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,6 +1075,7 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
+ int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1180,7 +1181,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port0-gpio", 80);
prop_dictionary_set_bool(dict, "port0-gpioval", true);
#endif
- int rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, &ioh);
+ rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, &ioh);
KASSERT(rv == 0);
uint32_t v = bus_space_read_4(iot, ioh, 0);
v &= 0xffff;
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.53 src/sys/arch/xen/xen/xenevt.c:1.54
--- src/sys/arch/xen/xen/xenevt.c:1.53 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/xen/xenevt.c Fri Nov 22 14:30:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: xenevt.c,v 1.54 2019/11/22 14:30:58 martin Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.54 2019/11/22 14:30:58 martin Exp $");
#include "opt_xen.h"
#include <sys/param.h>
@@ -161,7 +161,7 @@ static evtchn_port_t xenevt_alloc_event(
void
xenevtattach(int n)
{
- struct intrhand *ih;
+ struct intrhand *ih __diagused;
int level = IPL_HIGH;
bool mpsafe = (level != IPL_VM);
