Module Name: src
Committed By: martin
Date: Mon Apr 17 18:13:44 UTC 2023
Modified Files:
src/sys/kern [netbsd-8]: subr_prf.c
Log Message:
Fix merge mishap in applying the changes from rev 1.171 in ticket #1804:
patch accidently applied the change to a nearby very similar function
(aprint_verbose_internal instead of aprint_error_internal).
To generate a diff of this commit:
cvs rdiff -u -r1.160.8.1 -r1.160.8.2 src/sys/kern/subr_prf.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/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.160.8.1 src/sys/kern/subr_prf.c:1.160.8.2
--- src/sys/kern/subr_prf.c:1.160.8.1 Fri Feb 24 14:17:18 2023
+++ src/sys/kern/subr_prf.c Mon Apr 17 18:13:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.160.8.1 2023/02/24 14:17:18 martin Exp $ */
+/* $NetBSD: subr_prf.c,v 1.160.8.2 2023/04/17 18:13:44 martin Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.160.8.1 2023/02/24 14:17:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.160.8.2 2023/04/17 18:13:44 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -804,6 +804,7 @@ aprint_error_internal(const char *prefix
if (prefix)
kprintf_internal("%s: ", flags, NULL, NULL, prefix);
+ kprintf_internal("autoconfiguration error: ", TOLOG, NULL, NULL);
kprintf(fmt, flags, NULL, NULL, ap);
kprintf_unlock();
@@ -907,7 +908,6 @@ aprint_verbose_internal(const char *pref
if (prefix)
kprintf_internal("%s: ", flags, NULL, NULL, prefix);
- kprintf_internal("autoconfiguration error: ", TOLOG, NULL, NULL);
kprintf(fmt, flags, NULL, NULL, ap);
kprintf_unlock();
