Skip to content
Snippets Groups Projects
Commit 65ab592d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

parents 0910b444 eed66cfc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
include/asm-ia64/sal.h
+ 2
− 1
View file @ 65ab592d
...@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { ...@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp {
typedef struct sal_log_record_header { typedef struct sal_log_record_header {
u64 id; /* Unique monotonically increasing ID */ u64 id; /* Unique monotonically increasing ID */
sal_log_revision_t revision; /* Major and Minor revision of header */ 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 */ u32 len; /* Length of this error log in bytes */
sal_log_timestamp_t timestamp; /* Timestamp */ sal_log_timestamp_t timestamp; /* Timestamp */
efi_guid_t platform_guid; /* Unique OEM Platform ID */ efi_guid_t platform_guid; /* Unique OEM Platform ID */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment