[PATCH] RTAS error logs can appear twice in dmesg

Anton Blanchard anton at samba.org
Fri Sep 10 19:09:43 EST 2004


 
Ive started seeing rtas errors printed twice. Remove the second call
to printk_log_rtas.

Signed-off-by: Anton Blanchard <anton at samba.org>

===== rtasd.c 1.30 vs edited =====
--- 1.30/arch/ppc64/kernel/rtasd.c	Fri Sep  3 19:08:18 2004
+++ edited/rtasd.c	Fri Sep 10 17:09:57 2004
@@ -216,12 +216,13 @@
 	if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))
 		nvram_write_error_log(buf, len, err_type);
 
-	/* rtas errors can occur during boot, and we do want to capture
+	/*
+	 * rtas errors can occur during boot, and we do want to capture
 	 * those somewhere, even if nvram isn't ready (why not?), and even
-	 * if rtasd isn't ready. Put them into the boot log, at least.  */
-	if ((err_type & ERR_TYPE_MASK) == ERR_TYPE_RTAS_LOG) {
+	 * if rtasd isn't ready. Put them into the boot log, at least.
+	 */
+	if ((err_type & ERR_TYPE_MASK) == ERR_TYPE_RTAS_LOG)
 		printk_log_rtas(buf, len);
-	}
 
 	/* Check to see if we need to or have stopped logging */
 	if (fatal || no_more_logging) {
@@ -233,9 +234,6 @@
 	/* call type specific method for error */
 	switch (err_type & ERR_TYPE_MASK) {
 	case ERR_TYPE_RTAS_LOG:
-		/* put into syslog and error_log file */
-		printk_log_rtas(buf, len);
-
 		offset = rtas_error_log_buffer_max *
 			((rtas_log_start+rtas_log_size) & LOG_NUMBER_MASK);
 



More information about the Linuxppc64-dev mailing list