1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/efi.h b/include/linux/efi.h
index bd3837022307..d87acf62958e 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1579,9 +1579,22 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg,
 efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
                                 struct efi_boot_memmap *map);
 
+efi_status_t efi_low_alloc_above(efi_system_table_t *sys_table_arg,
+                                 unsigned long size, unsigned long align,
+                                 unsigned long *addr, unsigned long min);
+
+static inline
 efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
                            unsigned long size, unsigned long align,
-                           unsigned long *addr);
+                           unsigned long *addr)
+{
+        /*
+         * Don't allocate at 0x0. It will confuse code that
+         * checks pointers against NULL. Skip the first 8
+         * bytes so we start at a nice even number.
+         */
+        return efi_low_alloc_above(sys_table_arg, size, align, addr, 0x8);
+}
 
 efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg,
                             unsigned long size, unsigned long align,
@@ -1592,7 +1605,8 @@ efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
                                  unsigned long image_size,
                                  unsigned long alloc_size,
                                  unsigned long preferred_addr,
-                                 unsigned long alignment);
+                                 unsigned long alignment,
+                                 unsigned long min_addr);
 
 efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                                   efi_loaded_image_t *image,