From 007e505ae0ba5e967c5aebf29885a44263042654 Mon Sep 17 00:00:00 2001
From: Justin Forbes <jmforbes@xps.linuxtx.org>
Date: Mon, 30 Dec 2019 10:46:19 -0600
Subject: Linux v5.4.6 rebase

---
 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch')

diff --git a/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch b/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
index 0844550b6..871105093 100644
--- a/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
+++ b/0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
@@ -39,9 +39,9 @@ index 557a47829d0..e8f9c7d84e9 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -31,6 +31,7 @@
- #include <linux/acpi.h>
  #include <linux/ucs2_string.h>
  #include <linux/memblock.h>
+ #include <linux/security.h>
 +#include <linux/bsearch.h>
  
  #include <asm/early_ioremap.h>
@@ -177,7 +177,7 @@ index 557a47829d0..e8f9c7d84e9 100644
 +	return found->description;
  }
  
- bool efi_is_table_address(unsigned long phys_addr)
+ static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
 -- 
 2.15.0
 
-- 
cgit