diff options
author | Linas Vepstas <linas@austin.ibm.com> | 2007-08-08 16:06:15 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-16 21:01:52 -0400 |
commit | 79c0108d1b9db4864ab77b2a95dfa04f2dcf264c (patch) | |
tree | 861b770063674cdf7c4561b51dfabc4df4d13b85 /arch/powerpc/kernel/nvram_64.c | |
parent | 72755f44075d34cdb9bc467c6cd9a229292b5aff (diff) |
[POWERPC] pseries: Fix jumbled no_logging flag
Get rid of the jumbled usage of the no_logging flag. Its use
spans several directories, and is incorrectly/misleadingly
documented. Instead, two changes:
1) nvram will accept error log as soon as its ready.
2) logging to nvram stops on the first fatal error reported.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
arch/powerpc/kernel/nvram_64.c | 8 --------
arch/powerpc/platforms/pseries/rtasd.c | 14 ++++++--------
2 files changed, 6 insertions(+), 16 deletions(-)
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/nvram_64.c')
-rw-r--r-- | arch/powerpc/kernel/nvram_64.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index ba979908d17d..4a4d785a08d3 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c | |||
@@ -38,10 +38,6 @@ static struct nvram_partition * nvram_part; | |||
38 | static long nvram_error_log_index = -1; | 38 | static long nvram_error_log_index = -1; |
39 | static long nvram_error_log_size = 0; | 39 | static long nvram_error_log_size = 0; |
40 | 40 | ||
41 | int no_logging = 1; /* Until we initialize everything, | ||
42 | * make sure we don't try logging | ||
43 | * anything */ | ||
44 | |||
45 | extern volatile int error_log_cnt; | 41 | extern volatile int error_log_cnt; |
46 | 42 | ||
47 | struct err_log_info { | 43 | struct err_log_info { |
@@ -637,10 +633,6 @@ int nvram_write_error_log(char * buff, int length, unsigned int err_type) | |||
637 | loff_t tmp_index; | 633 | loff_t tmp_index; |
638 | struct err_log_info info; | 634 | struct err_log_info info; |
639 | 635 | ||
640 | if (no_logging) { | ||
641 | return -EPERM; | ||
642 | } | ||
643 | |||
644 | if (nvram_error_log_index == -1) { | 636 | if (nvram_error_log_index == -1) { |
645 | return -ESPIPE; | 637 | return -ESPIPE; |
646 | } | 638 | } |