Module Name: src Committed By: mrg Date: Wed Mar 9 10:04:06 UTC 2022
Modified Files: src/sys/dev/raidframe: rf_netbsdkintf.c Log Message: merge two debug lines in auto-root selection. To generate a diff of this commit: cvs rdiff -u -r1.401 -r1.402 src/sys/dev/raidframe/rf_netbsdkintf.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/dev/raidframe/rf_netbsdkintf.c diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.401 src/sys/dev/raidframe/rf_netbsdkintf.c:1.402 --- src/sys/dev/raidframe/rf_netbsdkintf.c:1.401 Thu Sep 9 23:26:37 2021 +++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Mar 9 10:04:06 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.401 2021/09/09 23:26:37 riastradh Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.402 2022/03/09 10:04:06 mrg Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.401 2021/09/09 23:26:37 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.402 2022/03/09 10:04:06 mrg Exp $"); #ifdef _KERNEL_OPT #include "opt_raid_autoconfig.h" @@ -631,11 +631,11 @@ rf_buildroothack(RF_ConfigSet_t *config_ candidate_root); } else candidate_root = dksc->sc_dev; - DPRINTF("%s: candidate root=%p\n", __func__, candidate_root); - DPRINTF("%s: booted_device=%p root_partition=%d " - "contains_boot=%d", - __func__, booted_device, rsc->sc_r.root_partition, - rf_containsboot(&rsc->sc_r, booted_device)); + DPRINTF("%s: candidate root=%p booted_device=%p " + "root_partition=%d contains_boot=%d\n", + __func__, candidate_root, booted_device, + rsc->sc_r.root_partition, + rf_containsboot(&rsc->sc_r, booted_device)); /* XXX the check for booted_device == NULL can probably be * dropped, now that rf_containsboot handles that case. */