diff options
author | Linas Vepstas <linas@austin.ibm.com> | 2007-08-09 16:56:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-16 21:01:52 -0400 |
commit | 0f2342c85df4248bc1cd72421b13969a0782ed6a (patch) | |
tree | b72286b35e4bb7502ea504ae5e6ddebd6da725d8 /include/asm-powerpc/nvram.h | |
parent | 79c0108d1b9db4864ab77b2a95dfa04f2dcf264c (diff) |
[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>
Diffstat (limited to 'include/asm-powerpc/nvram.h')
-rw-r--r-- | include/asm-powerpc/nvram.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-powerpc/nvram.h b/include/asm-powerpc/nvram.h index f3563e11e260..9877982508bf 100644 --- a/include/asm-powerpc/nvram.h +++ b/include/asm-powerpc/nvram.h | |||
@@ -63,8 +63,10 @@ struct nvram_partition { | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | 65 | ||
66 | extern int nvram_write_error_log(char * buff, int length, unsigned int err_type); | 66 | extern int nvram_write_error_log(char * buff, int length, |
67 | extern int nvram_read_error_log(char * buff, int length, unsigned int * err_type); | 67 | unsigned int err_type, unsigned int err_seq); |
68 | extern int nvram_read_error_log(char * buff, int length, | ||
69 | unsigned int * err_type, unsigned int *err_seq); | ||
68 | extern int nvram_clear_error_log(void); | 70 | extern int nvram_clear_error_log(void); |
69 | extern struct nvram_partition *nvram_find_partition(int sig, const char *name); | 71 | extern struct nvram_partition *nvram_find_partition(int sig, const char *name); |
70 | 72 | ||