Module Name: src
Committed By: christos
Date: Fri Apr 4 14:47:26 UTC 2014
Modified Files:
src/sys/arch/i386/pci: glxsb.c
src/sys/dev/gpio: gpio.c
Log Message:
PR/48701: Timo Buhrmester: spurious messages while booting silently (gpio,
glxsb); use aprint_normal()
>Category: kern
>Synopsis: spurious messages while booting silently (gpio, glxsb)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: kern-bug-people
>State: open
>Class: sw-bug
>Submitter-Id: net
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/pci/glxsb.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/gpio/gpio.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/i386/pci/glxsb.c
diff -u src/sys/arch/i386/pci/glxsb.c:1.10 src/sys/arch/i386/pci/glxsb.c:1.11
--- src/sys/arch/i386/pci/glxsb.c:1.10 Sat Nov 19 17:51:20 2011
+++ src/sys/arch/i386/pci/glxsb.c Fri Apr 4 10:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: glxsb.c,v 1.10 2011/11/19 22:51:20 tls Exp $ */
+/* $NetBSD: glxsb.c,v 1.11 2014/04/04 14:47:26 christos Exp $ */
/* $OpenBSD: glxsb.c,v 1.7 2007/02/12 14:31:45 tom Exp $ */
/*
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glxsb.c,v 1.10 2011/11/19 22:51:20 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxsb.c,v 1.11 2014/04/04 14:47:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -253,7 +253,7 @@ glxsb_attach(device_t parent, device_t s
callout_init(&sc->sc_co, 0);
callout_setfunc(&sc->sc_co, glxsb_rnd, sc);
glxsb_rnd(sc);
- printf(": RNG");
+ aprint_normal(": RNG");
/* We don't have an interrupt handler, so disable completion INTs */
intr = SB_AI_DISABLE_AES_A | SB_AI_DISABLE_AES_B |
@@ -264,9 +264,9 @@ glxsb_attach(device_t parent, device_t s
sc->sc_dmat = pa->pa_dmat;
if (glxsb_crypto_setup(sc))
- printf(" AES");
+ aprint_normal(" AES");
- printf("\n");
+ aprint_normal("\n");
}
void
Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.53 src/sys/dev/gpio/gpio.c:1.54
--- src/sys/dev/gpio/gpio.c:1.53 Sun Mar 16 01:20:27 2014
+++ src/sys/dev/gpio/gpio.c Fri Apr 4 10:47:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.53 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: gpio.c,v 1.54 2014/04/04 14:47:26 christos Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.53 2014/03/16 05:20:27 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.54 2014/04/04 14:47:26 christos Exp $");
/*
* General Purpose Input/Output framework.
@@ -276,10 +276,10 @@ gpio_print(void *aux, const char *pnp)
struct gpio_attach_args *ga = aux;
int i;
- printf(" pins");
+ aprint_normal(" pins");
for (i = 0; i < 32; i++)
if (ga->ga_mask & (1 << i))
- printf(" %d", ga->ga_offset + i);
+ aprint_normal(" %d", ga->ga_offset + i);
return UNCONF;
}
