1 files changed, 45 insertions, 0 deletions

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 37c300712e02..47fbf6b3dc77 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,6 +315,16 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
 
 typedef struct {
         efi_guid_t guid;
+        u64 table;
+} efi_config_table_64_t;
+
+typedef struct {
+        efi_guid_t guid;
+        u32 table;
+} efi_config_table_32_t;
+
+typedef struct {
+        efi_guid_t guid;
         unsigned long table;
 } efi_config_table_t;
 
@@ -329,6 +339,40 @@ typedef struct {
 
 typedef struct {
         efi_table_hdr_t hdr;
+        u64 fw_vendor;  /* physical addr of CHAR16 vendor string */
+        u32 fw_revision;
+        u32 __pad1;
+        u64 con_in_handle;
+        u64 con_in;
+        u64 con_out_handle;
+        u64 con_out;
+        u64 stderr_handle;
+        u64 stderr;
+        u64 runtime;
+        u64 boottime;
+        u32 nr_tables;
+        u32 __pad2;
+        u64 tables;
+} efi_system_table_64_t;
+
+typedef struct {
+        efi_table_hdr_t hdr;
+        u32 fw_vendor;  /* physical addr of CHAR16 vendor string */
+        u32 fw_revision;
+        u32 con_in_handle;
+        u32 con_in;
+        u32 con_out_handle;
+        u32 con_out;
+        u32 stderr_handle;
+        u32 stderr;
+        u32 runtime;
+        u32 boottime;
+        u32 nr_tables;
+        u32 tables;
+} efi_system_table_32_t;
+
+typedef struct {
+        efi_table_hdr_t hdr;
         unsigned long fw_vendor;        /* physical addr of CHAR16 vendor string */
         u32 fw_revision;
         unsigned long con_in_handle;
@@ -497,6 +541,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #ifdef CONFIG_EFI
 # ifdef CONFIG_X86
    extern int efi_enabled;
+   extern bool efi_64bit;
 # else
 #  define efi_enabled 1
 # endif