diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:22:50 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 22:22:50 -0500 |
commit | 36dfc3f67b3054e6bbc5344256461802aa5d6257 (patch) | |
tree | 760f07b428964b0c0961deabe2f2bb0f54155142 /include | |
parent | e8b09428482deff1a9d7a36d371acee364182ec3 (diff) | |
parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ia64/sal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h index 29df88bdd2bc..313cad0628d0 100644 --- a/include/asm-ia64/sal.h +++ b/include/asm-ia64/sal.h | |||
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { | |||
320 | typedef struct sal_log_record_header { | 320 | typedef struct sal_log_record_header { |
321 | u64 id; /* Unique monotonically increasing ID */ | 321 | u64 id; /* Unique monotonically increasing ID */ |
322 | sal_log_revision_t revision; /* Major and Minor revision of header */ | 322 | sal_log_revision_t revision; /* Major and Minor revision of header */ |
323 | u16 severity; /* Error Severity */ | 323 | u8 severity; /* Error Severity */ |
324 | u8 validation_bits; /* 0: platform_guid, 1: !timestamp */ | ||
324 | u32 len; /* Length of this error log in bytes */ | 325 | u32 len; /* Length of this error log in bytes */ |
325 | sal_log_timestamp_t timestamp; /* Timestamp */ | 326 | sal_log_timestamp_t timestamp; /* Timestamp */ |
326 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ | 327 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ |