From 02a7d0ba140bd8fc0dcce197b8f4ae3a50fffcda Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Fri, 13 Mar 2015 15:25:57 -0400
Subject: [PATCH] Fix esrt build on aarch64

Tested via cross build with:
[jwboyer@vader linux]$ aarch64-linux-gnu-gcc --version
aarch64-linux-gnu-gcc (GCC) 4.9.1 20140717 (Red Hat Cross 4.9.1-1)
---
 efi-Add-esrt-support.patch | 13 ++++++++-----
 kernel.spec                |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/efi-Add-esrt-support.patch b/efi-Add-esrt-support.patch
index 2b157529c..bd0c98e67 100644
--- a/efi-Add-esrt-support.patch
+++ b/efi-Add-esrt-support.patch
@@ -28,10 +28,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  Documentation/ABI/testing/sysfs-firmware-efi-esrt |  81 ++++
  arch/x86/platform/efi/efi.c                       |   2 +
  drivers/firmware/efi/Makefile                     |   2 +-
- drivers/firmware/efi/efi.c                        |  66 +++-
- drivers/firmware/efi/esrt.c                       | 461 ++++++++++++++++++++++
+ drivers/firmware/efi/efi.c                        |  66 ++-
+ drivers/firmware/efi/esrt.c                       | 464 ++++++++++++++++++++++
  include/linux/efi.h                               |   8 +
- 6 files changed, 618 insertions(+), 2 deletions(-)
+ 6 files changed, 621 insertions(+), 2 deletions(-)
  create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-esrt
  create mode 100644 drivers/firmware/efi/esrt.c
 
@@ -248,10 +248,10 @@ index 3061bb8629dc..e54ea20dfb42 100644
  
 diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
 new file mode 100644
-index 000000000000..1053b38f7e46
+index 000000000000..20c0cbdb1c60
 --- /dev/null
 +++ b/drivers/firmware/efi/esrt.c
-@@ -0,0 +1,461 @@
+@@ -0,0 +1,464 @@
 +/*
 + * esrt.c
 + *
@@ -278,6 +278,9 @@ index 000000000000..1053b38f7e46
 +#include <linux/slab.h>
 +#include <linux/types.h>
 +
++#include <asm/io.h>
++#include <asm/early_ioremap.h>
++
 +struct efi_system_resource_entry_v1 {
 +	efi_guid_t	fw_class;
 +	u32		fw_type;
diff --git a/kernel.spec b/kernel.spec
index 939c9d3b2..3b5ba3545 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1427,8 +1427,6 @@ ApplyPatch arm64-revert-tlb-rcu_table_free.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
 ApplyPatch kernel-arm64.patch -R
 ApplyPatch arm64-revert-tlb-rcu_table_free.patch -R
-%else
-ApplyPatch efi-Add-esrt-support.patch -R
 %endif
 %endif
 
@@ -2282,6 +2280,9 @@ fi
 #
 # 
 %changelog
+* Fri Mar 13 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix esrt build on aarch64
+
 * Fri Mar 13 2015 Kyle McMartin <kyle@fedoraproject.org>
 - arm64-revert-tlb-rcu_table_free.patch: revert 5e5f6dc1 which
   causes lockups on arm64 machines.