Module Name: src
Committed By: skrll
Date: Sun Oct 14 14:31:05 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c cpu.c pmap.c
src/sys/arch/arm/arm32: arm32_boot.c arm32_kvminit.c arm32_machdep.c
pmap.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Use __nothing
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/arm32/arm32_kvminit.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/fdt/fdt_machdep.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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.14 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.15
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.14 Sat Oct 13 08:32:36 2018
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.14 2018/10/13 08:32:36 ryo Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.15 2018/10/14 14:31:05 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.14 2018/10/13 08:32:36 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.15 2018/10/14 14:31:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -69,7 +69,7 @@ __KERNEL_RCSID(1, "$NetBSD: aarch64_mach
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
char cpu_model[32];
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.11 src/sys/arch/aarch64/aarch64/cpu.c:1.12
--- src/sys/arch/aarch64/aarch64/cpu.c:1.11 Thu Oct 4 07:36:10 2018
+++ src/sys/arch/aarch64/aarch64/cpu.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.11 2018/10/04 07:36:10 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.12 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.11 2018/10/04 07:36:10 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.12 2018/10/14 14:31:05 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -53,7 +53,7 @@ __KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.11
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
void cpu_attach(device_t, cpuid_t);
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.29 src/sys/arch/aarch64/aarch64/pmap.c:1.30
--- src/sys/arch/aarch64/aarch64/pmap.c:1.29 Fri Oct 12 01:28:57 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.29 2018/10/12 01:28:57 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.30 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.29 2018/10/12 01:28:57 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.30 2018/10/14 14:31:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
UVMHIST_DEFINE(pmaphist);
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.22 src/sys/arch/arm/arm32/arm32_boot.c:1.23
--- src/sys/arch/arm/arm32/arm32_boot.c:1.22 Sun Sep 16 11:34:20 2018
+++ src/sys/arch/arm/arm32/arm32_boot.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.22 2018/09/16 11:34:20 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.23 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.22 2018/09/16 11:34:20 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.23 2018/10/14 14:31:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -155,7 +155,7 @@ __KERNEL_RCSID(1, "$NetBSD: arm32_boot.c
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
#ifdef MULTIPROCESSOR
Index: src/sys/arch/arm/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.44 src/sys/arch/arm/arm32/arm32_kvminit.c:1.45
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.44 Fri Aug 3 15:46:41 2018
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.44 2018/08/03 15:46:41 skrll Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.45 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -126,7 +126,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.44 2018/08/03 15:46:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.45 2018/10/14 14:31:05 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -157,7 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_kvmini
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
struct bootmem_info bootmem_info;
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.121 src/sys/arch/arm/arm32/arm32_machdep.c:1.122
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.121 Fri Oct 12 21:44:20 2018
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.121 2018/10/12 21:44:20 jmcneill Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.122 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.121 2018/10/12 21:44:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.122 2018/10/14 14:31:05 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_fdt.h"
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machde
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
void (*cpu_reset_address)(void); /* Used by locore */
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.368 src/sys/arch/arm/arm32/pmap.c:1.369
--- src/sys/arch/arm/arm32/pmap.c:1.368 Mon Sep 3 16:29:23 2018
+++ src/sys/arch/arm/arm32/pmap.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.368 2018/09/03 16:29:23 riastradh Exp $ */
+/* $NetBSD: pmap.c,v 1.369 2018/10/14 14:31:05 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -217,7 +217,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.368 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.369 2018/10/14 14:31:05 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -262,7 +262,7 @@ int pmapdebug = 0;
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
/*
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.42 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.43
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.42 Thu Oct 4 07:33:54 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Oct 14 14:31:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.42 2018/10/04 07:33:54 ryo Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.43 2018/10/14 14:31:05 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.42 2018/10/04 07:33:54 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.43 2018/10/14 14:31:05 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -165,7 +165,7 @@ earlyconsgetc(dev_t dev)
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
-#define VPRINTF(...) do { } while (/* CONSTCOND */ 0)
+#define VPRINTF(...) __nothing
#endif
/*
