Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/kern Fix merge mishap in applying the changes from re...



details:   https://anonhg.NetBSD.org/src/rev/283059fb0e1e
branches:  netbsd-8
changeset: 374290:283059fb0e1e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 17 18:13:44 2023 +0000

description:
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).

diffstat:

 sys/kern/subr_prf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 73d96eede9ec -r 283059fb0e1e sys/kern/subr_prf.c
--- a/sys/kern/subr_prf.c       Sat Apr 01 16:50:36 2023 +0000
+++ b/sys/kern/subr_prf.c       Mon Apr 17 18:13:44 2023 +0000
@@ -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();



Home | Main Index | Thread Index | Old Index