diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-11 18:43:02 -0500 |
commit | 7e452baf6b96b5aeba097afd91501d33d390cc97 (patch) | |
tree | 9b0e062d3677d50d731ffd0fba47423bfdee9253 /arch/ia64/include/asm/sal.h | |
parent | 3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833 (diff) | |
parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c
Diffstat (limited to 'arch/ia64/include/asm/sal.h')
-rw-r--r-- | arch/ia64/include/asm/sal.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sal.h b/arch/ia64/include/asm/sal.h index ea310c0812aa..966797a97c94 100644 --- a/arch/ia64/include/asm/sal.h +++ b/arch/ia64/include/asm/sal.h | |||
@@ -337,11 +337,24 @@ typedef struct sal_log_record_header { | |||
337 | #define sal_log_severity_fatal 1 | 337 | #define sal_log_severity_fatal 1 |
338 | #define sal_log_severity_corrected 2 | 338 | #define sal_log_severity_corrected 2 |
339 | 339 | ||
340 | /* | ||
341 | * Error Recovery Info (ERI) bit decode. From SAL Spec section B.2.2 Table B-3 | ||
342 | * Error Section Error_Recovery_Info Field Definition. | ||
343 | */ | ||
344 | #define ERI_NOT_VALID 0x0 /* Error Recovery Field is not valid */ | ||
345 | #define ERI_NOT_ACCESSIBLE 0x30 /* Resource not accessible */ | ||
346 | #define ERI_CONTAINMENT_WARN 0x22 /* Corrupt data propagated */ | ||
347 | #define ERI_UNCORRECTED_ERROR 0x20 /* Uncorrected error */ | ||
348 | #define ERI_COMPONENT_RESET 0x24 /* Component must be reset */ | ||
349 | #define ERI_CORR_ERROR_LOG 0x21 /* Corrected error, needs logging */ | ||
350 | #define ERI_CORR_ERROR_THRESH 0x29 /* Corrected error threshold exceeded */ | ||
351 | |||
340 | /* Definition of log section header structures */ | 352 | /* Definition of log section header structures */ |
341 | typedef struct sal_log_sec_header { | 353 | typedef struct sal_log_sec_header { |
342 | efi_guid_t guid; /* Unique Section ID */ | 354 | efi_guid_t guid; /* Unique Section ID */ |
343 | sal_log_revision_t revision; /* Major and Minor revision of Section */ | 355 | sal_log_revision_t revision; /* Major and Minor revision of Section */ |
344 | u16 reserved; | 356 | u8 error_recovery_info; /* Platform error recovery status */ |
357 | u8 reserved; | ||
345 | u32 len; /* Section length */ | 358 | u32 len; /* Section length */ |
346 | } sal_log_section_hdr_t; | 359 | } sal_log_section_hdr_t; |
347 | 360 | ||