summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 23:36:54 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-13 23:36:54 +0300
commit65ab592dc5b34caebabfe1340e7c18f52a785079 (patch)
tree568e8ed84290c32551e69b2e001758f8c1178ad8
parent0910b444bcd7ea7f437a3ff48e0e3d2495ead22e (diff)
parenteed66cfcbbea851c97e287440d940286fce3f829 (diff)
downloadlinux-65ab592dc5b34caebabfe1340e7c18f52a785079.tar.xz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
-rw-r--r--include/asm-ia64/sal.h3
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 {
typedef struct sal_log_record_header {
u64 id; /* Unique monotonically increasing ID */
sal_log_revision_t revision; /* Major and Minor revision of header */
- u16 severity; /* Error Severity */
+ u8 severity; /* Error Severity */
+ u8 validation_bits; /* 0: platform_guid, 1: !timestamp */
u32 len; /* Length of this error log in bytes */
sal_log_timestamp_t timestamp; /* Timestamp */
efi_guid_t platform_guid; /* Unique OEM Platform ID */