[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>
此提交包含在:
@@ -38,8 +38,6 @@ static struct nvram_partition * nvram_part;
|
||||
static long nvram_error_log_index = -1;
|
||||
static long nvram_error_log_size = 0;
|
||||
|
||||
extern volatile int error_log_cnt;
|
||||
|
||||
struct err_log_info {
|
||||
int error_type;
|
||||
unsigned int seq_num;
|
||||
@@ -627,7 +625,8 @@ void __exit nvram_cleanup(void)
|
||||
* sequence #: The unique sequence # for each event. (until it wraps)
|
||||
* 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;
|
||||
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'
|
||||
*/
|
||||
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;
|
||||
loff_t tmp_index;
|
||||
@@ -691,7 +691,7 @@ int nvram_read_error_log(char * buff, int length, unsigned int * err_type)
|
||||
return rc;
|
||||
}
|
||||
|
||||
error_log_cnt = info.seq_num;
|
||||
*error_log_cnt = info.seq_num;
|
||||
*err_type = info.error_type;
|
||||
|
||||
return 0;
|
||||
|
新增問題並參考
封鎖使用者