Commit e77f2a5f authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: RTAS error logs can appear twice in dmesg

I've started seeing rtas errors printed twice.  Remove the second call to
printk_log_rtas.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4c66721
...@@ -216,12 +216,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) ...@@ -216,12 +216,13 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
if (!no_more_logging && !(err_type & ERR_FLAG_BOOT)) if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))
nvram_write_error_log(buf, len, err_type); 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 * 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 rtasd isn't ready. Put them into the boot log, at least.
if ((err_type & ERR_TYPE_MASK) == ERR_TYPE_RTAS_LOG) { */
if ((err_type & ERR_TYPE_MASK) == ERR_TYPE_RTAS_LOG)
printk_log_rtas(buf, len); printk_log_rtas(buf, len);
}
/* Check to see if we need to or have stopped logging */ /* Check to see if we need to or have stopped logging */
if (fatal || no_more_logging) { if (fatal || no_more_logging) {
...@@ -233,9 +234,6 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal) ...@@ -233,9 +234,6 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
/* call type specific method for error */ /* call type specific method for error */
switch (err_type & ERR_TYPE_MASK) { switch (err_type & ERR_TYPE_MASK) {
case ERR_TYPE_RTAS_LOG: case ERR_TYPE_RTAS_LOG:
/* put into syslog and error_log file */
printk_log_rtas(buf, len);
offset = rtas_error_log_buffer_max * offset = rtas_error_log_buffer_max *
((rtas_log_start+rtas_log_size) & LOG_NUMBER_MASK); ((rtas_log_start+rtas_log_size) & LOG_NUMBER_MASK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment