[src/netbsd-9]: src/sys/arch Pull up following revision(s) (requested by mart...

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

details:   https://anonhg.NetBSD.org/src/rev/0947a4e7cef7
branches:  netbsd-9
changeset: 963304:0947a4e7cef7
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Nov 22 15:28:17 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #463):
        sys/arch/xen/xen/xenevt.c: revision 1.54
        sys/arch/arm/omap/obio_mputmr.c: revision 1.9
        sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.79
Make this files compilable w/o options DIAGNOSTIC

diffstat:

 sys/arch/arm/omap/obio_mputmr.c         |  8 ++++----
 sys/arch/evbarm/beagle/beagle_machdep.c |  7 ++++---
 sys/arch/xen/xen/xenevt.c               |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r e03daad7d48f -r 0947a4e7cef7 sys/arch/arm/omap/obio_mputmr.c
--- a/sys/arch/arm/omap/obio_mputmr.c   Fri Nov 22 15:26:28 2019 +0000
+++ b/sys/arch/arm/omap/obio_mputmr.c   Fri Nov 22 15:28:17 2019 +0000
@@ -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.8.38.1 2019/11/22 15:28:18 bouyer 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.8.38.1 2019/11/22 15:28:18 bouyer Exp $");
 
 #include "opt_omap.h"
 #include "opt_cpuoptions.h"
@@ -302,9 +302,9 @@
 
 #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);
 
diff -r e03daad7d48f -r 0947a4e7cef7 sys/arch/evbarm/beagle/beagle_machdep.c
--- a/sys/arch/evbarm/beagle/beagle_machdep.c   Fri Nov 22 15:26:28 2019 +0000
+++ b/sys/arch/evbarm/beagle/beagle_machdep.c   Fri Nov 22 15:28:17 2019 +0000
@@ -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.78.2.1 2019/11/22 15:28:18 bouyer 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.78.2.1 2019/11/22 15:28:18 bouyer Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -1075,6 +1075,7 @@
 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 @@
                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;
diff -r e03daad7d48f -r 0947a4e7cef7 sys/arch/xen/xen/xenevt.c
--- a/sys/arch/xen/xen/xenevt.c Fri Nov 22 15:26:28 2019 +0000
+++ b/sys/arch/xen/xen/xenevt.c Fri Nov 22 15:28:17 2019 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $      */
+/*      $NetBSD: xenevt.c,v 1.53.4.1 2019/11/22 15:28:17 bouyer 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.53.4.1 2019/11/22 15:28:17 bouyer Exp $");
 
 #include "opt_xen.h"
 #include <sys/param.h>
@@ -161,7 +161,7 @@
 void
 xenevtattach(int n)
 {
-       struct intrhand *ih;
+       struct intrhand *ih __diagused;
        int level = IPL_HIGH;
        bool mpsafe = (level != IPL_VM);