diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 12:36:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 12:36:54 -0800 |
| commit | 65ab592dc5b34caebabfe1340e7c18f52a785079 (patch) | |
| tree | 568e8ed84290c32551e69b2e001758f8c1178ad8 /include | |
| parent | Expose "Optimize for size" option for everybody (diff) | |
| parent | [IA64] Split 16-bit severity field in sal_log_record_header (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 { 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 */ |