Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67435
b: refs/heads/master
c: a0c7ce9
h: refs/heads/master
i:
  67433: 3f346d3
  67431: a49b2cd
v: v3
  • Loading branch information
Tony Breeds authored and Paul Mackerras committed Oct 3, 2007
1 parent 3320191 commit ef83f33
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2d5f5659649924b86d527a2af2552bab741d1d6f
refs/heads/master: a0c7ce9c877ceef8428798ac91fb794f83609aed
15 changes: 9 additions & 6 deletions trunk/arch/powerpc/platforms/pseries/rtasd.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ static unsigned int rtas_event_scan_rate;
static int full_rtas_msgs = 0;

/* Stop logging to nvram after first fatal error */
static int no_more_logging;

static int logging_enabled; /* Until we initialize everything,
* make sure we don't try logging
* anything */
static int error_log_cnt;

/*
Expand Down Expand Up @@ -217,7 +218,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
}

/* Write error to NVRAM */
if (!no_more_logging && !(err_type & ERR_FLAG_BOOT))
if (logging_enabled && !(err_type & ERR_FLAG_BOOT))
nvram_write_error_log(buf, len, err_type, error_log_cnt);

/*
Expand All @@ -229,8 +230,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
printk_log_rtas(buf, len);

/* Check to see if we need to or have stopped logging */
if (fatal || no_more_logging) {
no_more_logging = 1;
if (fatal || !logging_enabled) {
logging_enabled = 0;
spin_unlock_irqrestore(&rtasd_log_lock, s);
return;
}
Expand Down Expand Up @@ -302,7 +303,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,

spin_lock_irqsave(&rtasd_log_lock, s);
/* if it's 0, then we know we got the last one (the one in NVRAM) */
if (rtas_log_size == 0 && !no_more_logging)
if (rtas_log_size == 0 && logging_enabled)
nvram_clear_error_log();
spin_unlock_irqrestore(&rtasd_log_lock, s);

Expand Down Expand Up @@ -414,6 +415,8 @@ static int rtasd(void *unused)
memset(logdata, 0, rtas_error_log_max);
rc = nvram_read_error_log(logdata, rtas_error_log_max,
&err_type, &error_log_cnt);
/* We can use rtas_log_buf now */
logging_enabled = 1;

if (!rc) {
if (err_type != ERR_FLAG_ALREADY_LOGGED) {
Expand Down

0 comments on commit ef83f33

Please sign in to comment.