Module Name: src
Committed By: skrll
Date: Fri Oct 19 08:30:57 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c
Log Message:
Fix build for non-generic start kernels
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/arm/arm32/arm32_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/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.123 src/sys/arch/arm/arm32/arm32_machdep.c:1.124
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.123 Thu Oct 18 09:01:52 2018
+++ src/sys/arch/arm/arm32/arm32_machdep.c Fri Oct 19 08:30:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.123 2018/10/18 09:01:52 skrll Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.124 2018/10/19 08:30:57 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.123 2018/10/18 09:01:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.124 2018/10/19 08:30:57 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_arm_start.h"
@@ -90,12 +90,17 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machde
#endif
#ifdef VERBOSE_INIT_ARM
+#define VPRINTF(...) printf(__VA_ARGS__)
+#ifdef __HAVE_GENERIC_START
void generic_prints(const char *);
void generic_printx(int);
-#define VPRINTF(...) printf(__VA_ARGS__)
#define VPRINTS(s) generic_prints(s)
#define VPRINTX(x) generic_printx(x)
#else
+#define VPRINTS(s) __nothing
+#define VPRINTX(x) __nothing
+#endif
+#else
#define VPRINTF(...) __nothing
#define VPRINTS(s) __nothing
#define VPRINTX(x) __nothing
