Module Name: src
Committed By: mrg
Date: Wed Aug 5 07:01:11 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: mainbus.c
src/sys/arch/i386/i386: mainbus.c
Log Message:
allow MPVERBOSE to be set to a value that sets the "mp_verbose" variable.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amd64/amd64/mainbus.c
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/i386/i386/mainbus.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/amd64/amd64/mainbus.c
diff -u src/sys/arch/amd64/amd64/mainbus.c:1.35 src/sys/arch/amd64/amd64/mainbus.c:1.36
--- src/sys/arch/amd64/amd64/mainbus.c:1.35 Mon Apr 27 07:03:57 2015
+++ src/sys/arch/amd64/amd64/mainbus.c Wed Aug 5 07:01:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.35 2015/04/27 07:03:57 knakahara Exp $ */
+/* $NetBSD: mainbus.c,v 1.36 2015/08/05 07:01:10 mrg Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.35 2015/04/27 07:03:57 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2015/08/05 07:01:10 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,11 +126,15 @@ int mp_nintr;
int mp_isa_bus = -1;
int mp_eisa_bus = -1;
-#ifdef MPVERBOSE
+# ifdef MPVERBOSE
+# if MPVERBOSE > 0
+int mp_verbose = MPVERBOSE;
+# else
int mp_verbose = 1;
-#else
+# endif
+# else
int mp_verbose = 0;
-#endif
+# endif
#endif
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.100 src/sys/arch/i386/i386/mainbus.c:1.101
--- src/sys/arch/i386/i386/mainbus.c:1.100 Mon Apr 27 08:30:11 2015
+++ src/sys/arch/i386/i386/mainbus.c Wed Aug 5 07:01:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.100 2015/04/27 08:30:11 knakahara Exp $ */
+/* $NetBSD: mainbus.c,v 1.101 2015/08/05 07:01:11 mrg Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.100 2015/04/27 08:30:11 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.101 2015/08/05 07:01:11 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,11 +161,15 @@ int mp_nintr;
int mp_isa_bus = -1; /* XXX */
int mp_eisa_bus = -1; /* XXX */
-#ifdef MPVERBOSE
+# ifdef MPVERBOSE
+# if MPVERBOSE > 0
+int mp_verbose = MPVERBOSE;
+# else
int mp_verbose = 1;
-#else
+# endif
+# else
int mp_verbose = 0;
-#endif
+# endif
#endif
void
