Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk...

[karo-tx-linux.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 2092965afca3994606ee8a255a97929a38df8095..85ef051ac6fb43a64c38779c6bf754d2e492abcf 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -85,7 +85,8 @@ typedef       struct {
 #define EFI_MEMORY_MAPPED_IO           11
 #define EFI_MEMORY_MAPPED_IO_PORT_SPACE        12
 #define EFI_PAL_CODE                   13
-#define EFI_MAX_MEMORY_TYPE            14
+#define EFI_PERSISTENT_MEMORY          14
+#define EFI_MAX_MEMORY_TYPE            15
 
 /* Attribute values: */
 #define EFI_MEMORY_UC          ((u64)0x0000000000000001ULL)    /* uncached */
@@ -96,6 +97,8 @@ typedef       struct {
 #define EFI_MEMORY_WP          ((u64)0x0000000000001000ULL)    /* write-protect */
 #define EFI_MEMORY_RP          ((u64)0x0000000000002000ULL)    /* read-protect */
 #define EFI_MEMORY_XP          ((u64)0x0000000000004000ULL)    /* execute-protect */
+#define EFI_MEMORY_MORE_RELIABLE \
+                               ((u64)0x0000000000010000ULL)    /* higher reliability */
 #define EFI_MEMORY_RUNTIME     ((u64)0x8000000000000000ULL)    /* range requires runtime mapping */
 #define EFI_MEMORY_DESCRIPTOR_VERSION  1
 
@@ -868,6 +871,7 @@ extern void efi_enter_virtual_mode (void);  /* switch EFI to virtual mode, if pos
 extern void efi_late_init(void);
 extern void efi_free_boot_services(void);
 extern efi_status_t efi_query_variable_store(u32 attributes, unsigned long size);
+extern void efi_find_mirror(void);
 #else
 static inline void efi_late_init(void) {}
 static inline void efi_free_boot_services(void) {}