Module Name: src
Committed By: bouyer
Date: Sun Feb 14 13:35:44 UTC 2010
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: pmap.c x86_autoconf.c
src/sys/dev/pci [netbsd-5]: agp_via.c
src/sys/kern [netbsd-5]: cnmagic.c init_main.c kern_ksyms.c
src/sys/netipsec [netbsd-5]: ipsec.c key.c
src/sys/netkey [netbsd-5]: key.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1290):
sys/kern/kern_ksyms.c: revision 1.53
sys/dev/pci/agp_via.c: revision 1.18
sys/netipsec/key.c: revision 1.63
sys/arch/x86/x86/x86_autoconf.c: revision 1.49
sys/kern/init_main.c: revision 1.415
sys/kern/cnmagic.c: revision 1.11
sys/netipsec/ipsec.c: revision 1.47
sys/arch/x86/x86/pmap.c: revision 1.100
sys/netkey/key.c: revision 1.176
Replace more printfs with aprint_normal / aprint_verbose
Makes "boot -z" go mostly silent for me.
To generate a diff of this commit:
cvs rdiff -u -r1.74.4.1 -r1.74.4.2 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/arch/x86/x86/x86_autoconf.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/pci/agp_via.c
cvs rdiff -u -r1.9 -r1.9.64.1 src/sys/kern/cnmagic.c
cvs rdiff -u -r1.371.2.3 -r1.371.2.4 src/sys/kern/init_main.c
cvs rdiff -u -r1.41.4.1 -r1.41.4.2 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r1.39.6.1 -r1.39.6.2 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.57 -r1.57.4.1 src/sys/netipsec/key.c
cvs rdiff -u -r1.163 -r1.163.4.1 src/sys/netkey/key.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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.74.4.1 src/sys/arch/x86/x86/pmap.c:1.74.4.2
--- src/sys/arch/x86/x86/pmap.c:1.74.4.1 Sat Apr 4 17:39:09 2009
+++ src/sys/arch/x86/x86/pmap.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.74.4.1 2009/04/04 17:39:09 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.74.4.2 2010/02/14 13:35:44 bouyer Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -154,7 +154,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.4.1 2009/04/04 17:39:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.4.2 2010/02/14 13:35:44 bouyer Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -1323,7 +1323,7 @@
tlbflush();
}
#if defined(DEBUG)
- printf("kernel text is mapped with "
+ aprint_normal("kernel text is mapped with "
"%lu large pages and %lu normal pages\n",
(unsigned long)howmany(kva - KERNBASE, NBPD_L2),
(unsigned long)howmany((vaddr_t)&__data_start - kva,
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.35 src/sys/arch/x86/x86/x86_autoconf.c:1.35.4.1
--- src/sys/arch/x86/x86/x86_autoconf.c:1.35 Tue Oct 14 15:48:44 2008
+++ src/sys/arch/x86/x86/x86_autoconf.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.35 2008/10/14 15:48:44 tsutsui Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.35.4.1 2010/02/14 13:35:44 bouyer Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.35 2008/10/14 15:48:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.35.4.1 2010/02/14 13:35:44 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -473,11 +473,11 @@
if (booted_wedge) {
KASSERT(booted_device != NULL);
- printf("boot device: %s (%s)\n",
+ aprint_normal("boot device: %s (%s)\n",
device_xname(booted_wedge), device_xname(booted_device));
setroot(booted_wedge, 0);
} else {
- printf("boot device: %s\n",
+ aprint_normal("boot device: %s\n",
booted_device ? device_xname(booted_device) : "<unknown>");
setroot(booted_device, booted_partition);
}
Index: src/sys/dev/pci/agp_via.c
diff -u src/sys/dev/pci/agp_via.c:1.17 src/sys/dev/pci/agp_via.c:1.17.8.1
--- src/sys/dev/pci/agp_via.c:1.17 Mon Jun 9 06:49:54 2008
+++ src/sys/dev/pci/agp_via.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.17 2008/06/09 06:49:54 freza Exp $ */
+/* $NetBSD: agp_via.c,v 1.17.8.1 2010/02/14 13:35:44 bouyer Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.17 2008/06/09 06:49:54 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.17.8.1 2010/02/14 13:35:44 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,14 +107,14 @@
agpsel = pci_conf_read(pa->pa_pc, pa->pa_tag, AGP_VIA_AGPSEL);
if ((agpsel & (1 << 9)) == 0) {
asc->regs = via_v3_regs;
- printf(" (v3)");
+ aprint_normal(" (v3)");
} else {
asc->regs = via_v2_regs;
- printf(" (v2 compat mode)");
+ aprint_normal(" (v2 compat mode)");
}
} else {
asc->regs = via_v2_regs;
- printf(" (v2)");
+ aprint_normal(" (v2)");
}
if (agp_map_aperture(pa, sc, AGP_APBASE) != 0) {
Index: src/sys/kern/cnmagic.c
diff -u src/sys/kern/cnmagic.c:1.9 src/sys/kern/cnmagic.c:1.9.64.1
--- src/sys/kern/cnmagic.c:1.9 Wed Nov 1 10:17:58 2006
+++ src/sys/kern/cnmagic.c Sun Feb 14 13:35:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $ */
+/* $NetBSD: cnmagic.c,v 1.9.64.1 2010/02/14 13:35:43 bouyer Exp $ */
/*
* Copyright (c) 2000 Eduardo Horvath
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cnmagic.c,v 1.9 2006/11/01 10:17:58 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cnmagic.c,v 1.9.64.1 2010/02/14 13:35:43 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@
/* Transition to the next state. */
#ifdef DEBUG
if (!cold)
- printf("mag %d %x:%x\n", i, c, n);
+ aprint_normal("mag %d %x:%x\n", i, c, n);
#endif
m[i] = ENCODE_STATE(c, n);
break;
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.371.2.3 src/sys/kern/init_main.c:1.371.2.4
--- src/sys/kern/init_main.c:1.371.2.3 Sat Apr 4 17:39:10 2009
+++ src/sys/kern/init_main.c Sun Feb 14 13:35:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.371.2.3 2009/04/04 17:39:10 snj Exp $ */
+/* $NetBSD: init_main.c,v 1.371.2.4 2010/02/14 13:35:43 bouyer Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371.2.3 2009/04/04 17:39:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371.2.4 2010/02/14 13:35:43 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -826,7 +826,7 @@
*flagsp++ = '\0';
i = flagsp - flags;
#ifdef DEBUG
- printf("init: copying out flags `%s' %d\n", flags, i);
+ aprint_normal("init: copying out flags `%s' %d\n", flags, i);
#endif
arg1 = STACK_ALLOC(ucp, i);
ucp = STACK_MAX(arg1, i);
@@ -838,7 +838,7 @@
*/
i = strlen(path) + 1;
#ifdef DEBUG
- printf("init: copying out path `%s' %d\n", path, i);
+ aprint_normal("init: copying out path `%s' %d\n", path, i);
#else
if (boothowto & RB_ASKNAME || path != initpaths[0])
printf("init: trying %s\n", path);
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.41.4.1 src/sys/kern/kern_ksyms.c:1.41.4.2
--- src/sys/kern/kern_ksyms.c:1.41.4.1 Tue Mar 31 23:23:15 2009
+++ src/sys/kern/kern_ksyms.c Sun Feb 14 13:35:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.41.4.1 2009/03/31 23:23:15 snj Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.41.4.2 2010/02/14 13:35:43 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.41.4.1 2009/03/31 23:23:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.41.4.2 2010/02/14 13:35:43 bouyer Exp $");
#ifdef _KERNEL
#include "opt_ddb.h"
@@ -474,7 +474,7 @@
&kernel_symtab, start);
#ifdef DEBUG
- printf("Loaded initial symtab at %p, strtab at %p, # entries %ld\n",
+ aprint_normal("Loaded initial symtab at %p, strtab at %p, # entries %ld\n",
kernel_symtab.sd_symstart, kernel_symtab.sd_strstart,
(long)kernel_symtab.sd_symsize/sizeof(Elf_Sym));
#endif
Index: src/sys/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.39.6.1 src/sys/netipsec/ipsec.c:1.39.6.2
--- src/sys/netipsec/ipsec.c:1.39.6.1 Fri Aug 7 06:05:50 2009
+++ src/sys/netipsec/ipsec.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.39.6.1 2009/08/07 06:05:50 snj Exp $ */
+/* $NetBSD: ipsec.c,v 1.39.6.2 2010/02/14 13:35:44 bouyer Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.39.6.1 2009/08/07 06:05:50 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.39.6.2 2010/02/14 13:35:44 bouyer Exp $");
/*
* IPsec controller part.
@@ -2274,7 +2274,7 @@
ipsecstat_percpu = percpu_alloc(sizeof(uint64_t) * IPSEC_NSTATS);
- printf("initializing IPsec...");
+ aprint_verbose("initializing IPsec...");
ah_attach();
esp_attach();
ipcomp_attach();
@@ -2282,6 +2282,6 @@
#ifdef TCP_SIGNATURE
tcpsignature_attach();
#endif
- printf(" done\n");
+ aprint_verbose(" done\n");
}
#endif /* __NetBSD__ */
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.57 src/sys/netipsec/key.c:1.57.4.1
--- src/sys/netipsec/key.c:1.57 Fri Jul 25 20:55:43 2008
+++ src/sys/netipsec/key.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.57 2008/07/25 20:55:43 dsl Exp $ */
+/* $NetBSD: key.c,v 1.57.4.1 2010/02/14 13:35:44 bouyer Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.57 2008/07/25 20:55:43 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.57.4.1 2010/02/14 13:35:44 bouyer Exp $");
/*
* This code is referd to RFC 2367
@@ -7677,7 +7677,7 @@
/* initialize key statistics */
keystat.getspi_count = 1;
- printf("IPsec: Initialized Security Association Processing.\n");
+ aprint_verbose("IPsec: Initialized Security Association Processing.\n");
return (0);
}
Index: src/sys/netkey/key.c
diff -u src/sys/netkey/key.c:1.163 src/sys/netkey/key.c:1.163.4.1
--- src/sys/netkey/key.c:1.163 Sun Jul 27 20:12:47 2008
+++ src/sys/netkey/key.c Sun Feb 14 13:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.163 2008/07/27 20:12:47 dsl Exp $ */
+/* $NetBSD: key.c,v 1.163.4.1 2010/02/14 13:35:44 bouyer Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.163 2008/07/27 20:12:47 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.163.4.1 2010/02/14 13:35:44 bouyer Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -8095,7 +8095,7 @@
/* initialize key statistics */
keystat.getspi_count = 1;
- printf("IPsec: Initialized Security Association Processing.\n");
+ aprint_verbose("IPsec: Initialized Security Association Processing.\n");
return (0);
}
