From 340bcf2127579624da626e3c21fae8f9fe46f309 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Tue, 15 Nov 2011 12:56:50 +0000 Subject: [PATCH] --- yaml --- r: 283531 b: refs/heads/master c: 8e84f345e2f2189a37492c77c566c7494b7b6b23 h: refs/heads/master i: 283529: c938dfb24a166661cc5235294ee1b196a556cbf8 283527: 5619f49577a78222f4c53be1c1c5e7b0db2226bf v: v3 --- [refs] | 2 +- trunk/include/linux/efi.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 67ceb8734e26..d2df19b5bebe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f30ca6ba0bb2b7d050f24682bb8639c939c79859 +refs/heads/master: 8e84f345e2f2189a37492c77c566c7494b7b6b23 diff --git a/trunk/include/linux/efi.h b/trunk/include/linux/efi.h index 9547597ad6be..e35005f451db 100644 --- a/trunk/include/linux/efi.h +++ b/trunk/include/linux/efi.h @@ -287,6 +287,9 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules, #define LINUX_EFI_CRASH_GUID \ EFI_GUID( 0xcfc8fc79, 0xbe2e, 0x4ddc, 0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0 ) +#define LOADED_IMAGE_PROTOCOL_GUID \ + EFI_GUID( 0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b ) + typedef struct { efi_guid_t guid; unsigned long table; @@ -326,6 +329,22 @@ struct efi_memory_map { unsigned long desc_size; }; +typedef struct { + u32 revision; + void *parent_handle; + efi_system_table_t *system_table; + void *device_handle; + void *file_path; + void *reserved; + u32 load_options_size; + void *load_options; + void *image_base; + __aligned_u64 image_size; + unsigned int image_code_type; + unsigned int image_data_type; + unsigned long unload; +} efi_loaded_image_t; + #define EFI_INVALID_TABLE_ADDR (~0UL) /*