[POWERPC] pseries: Eliminate global error_log_cnt variable
Eliminate the use of error_log_cnt as a global var shared across different directories. Pass it as a parameter instead. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> ---- Respin of earlier patch, with the CONFIG_PSERIES junk removed from the header file. arch/powerpc/kernel/nvram_64.c | 10 +++++----- arch/powerpc/platforms/pseries/rtasd.c | 7 ++++--- include/asm-powerpc/nvram.h | 6 ++++-- 3 files changed, 13 insertions(+), 10 deletions(-) Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
79c0108d1b
commit
0f2342c85d
|
@ -38,8 +38,6 @@ static struct nvram_partition * nvram_part;
|
||||||
static long nvram_error_log_index = -1;
|
static long nvram_error_log_index = -1;
|
||||||
static long nvram_error_log_size = 0;
|
static long nvram_error_log_size = 0;
|
||||||
|
|
||||||
extern volatile int error_log_cnt;
|
|
||||||
|
|
||||||
struct err_log_info {
|
struct err_log_info {
|
||||||
int error_type;
|
int error_type;
|
||||||
unsigned int seq_num;
|
unsigned int seq_num;
|
||||||
|
@ -627,7 +625,8 @@ void __exit nvram_cleanup(void)
|
||||||
* sequence #: The unique sequence # for each event. (until it wraps)
|
* sequence #: The unique sequence # for each event. (until it wraps)
|
||||||
* error log: The error log from event_scan
|
* error log: The error log from event_scan
|
||||||
*/
|
*/
|
||||||
int nvram_write_error_log(char * buff, int length, unsigned int err_type)
|
int nvram_write_error_log(char * buff, int length,
|
||||||
|
unsigned int err_type, unsigned int error_log_cnt)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
loff_t tmp_index;
|
loff_t tmp_index;
|
||||||
|
@ -665,7 +664,8 @@ int nvram_write_error_log(char * buff, int length, unsigned int err_type)
|
||||||
*
|
*
|
||||||
* Reads nvram for error log for at most 'length'
|
* Reads nvram for error log for at most 'length'
|
||||||
*/
|
*/
|
||||||
int nvram_read_error_log(char * buff, int length, unsigned int * err_type)
|
int nvram_read_error_log(char * buff, int length,
|
||||||
|
unsigned int * err_type, unsigned int * error_log_cnt)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
loff_t tmp_index;
|
loff_t tmp_index;
|
||||||
|
@ -691,7 +691,7 @@ int nvram_read_error_log(char * buff, int length, unsigned int * err_type)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
error_log_cnt = info.seq_num;
|
*error_log_cnt = info.seq_num;
|
||||||
*err_type = info.error_type;
|
*err_type = info.error_type;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -56,7 +56,7 @@ static int full_rtas_msgs = 0;
|
||||||
/* Stop logging to nvram after first fatal error */
|
/* Stop logging to nvram after first fatal error */
|
||||||
static int no_more_logging;
|
static int no_more_logging;
|
||||||
|
|
||||||
volatile int error_log_cnt = 0;
|
static int error_log_cnt;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Since we use 32 bit RTAS, the physical address of this must be below
|
* Since we use 32 bit RTAS, the physical address of this must be below
|
||||||
|
@ -218,7 +218,7 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
|
||||||
|
|
||||||
/* Write error to NVRAM */
|
/* Write error to NVRAM */
|
||||||
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, error_log_cnt);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* rtas errors can occur during boot, and we do want to capture
|
* rtas errors can occur during boot, and we do want to capture
|
||||||
|
@ -412,7 +412,8 @@ static int rtasd(void *unused)
|
||||||
|
|
||||||
/* See if we have any error stored in NVRAM */
|
/* See if we have any error stored in NVRAM */
|
||||||
memset(logdata, 0, rtas_error_log_max);
|
memset(logdata, 0, rtas_error_log_max);
|
||||||
rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type);
|
rc = nvram_read_error_log(logdata, rtas_error_log_max,
|
||||||
|
&err_type, &error_log_cnt);
|
||||||
|
|
||||||
if (!rc) {
|
if (!rc) {
|
||||||
if (err_type != ERR_FLAG_ALREADY_LOGGED) {
|
if (err_type != ERR_FLAG_ALREADY_LOGGED) {
|
||||||
|
|
|
@ -63,8 +63,10 @@ struct nvram_partition {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
extern int nvram_write_error_log(char * buff, int length, unsigned int err_type);
|
extern int nvram_write_error_log(char * buff, int length,
|
||||||
extern int nvram_read_error_log(char * buff, int length, unsigned int * err_type);
|
unsigned int err_type, unsigned int err_seq);
|
||||||
|
extern int nvram_read_error_log(char * buff, int length,
|
||||||
|
unsigned int * err_type, unsigned int *err_seq);
|
||||||
extern int nvram_clear_error_log(void);
|
extern int nvram_clear_error_log(void);
|
||||||
extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
|
extern struct nvram_partition *nvram_find_partition(int sig, const char *name);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue