From: Shannon Zhao <shannon.zhao@linaro.org>
Date: Tue, 10 Nov 2015 11:08:29 +0000 (+0100)
Subject: efi: fix booting failure with UEFI on ARM
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2283
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4fa72bd15564c59cbd54d4db31a3060293e782ca;p=xen.git

efi: fix booting failure with UEFI on ARM

Commit 9fd08b4 (efi: split out efi_get_gop()) splits out the
codes getting the pointer to GOP as efi_get_gop(), but it doesn't
initialize the variable handles and gop to NULL like what the original
codes do. This will cause booting failure on ARM while printing below
logs:
	Xen 4.7-unstable (c/s Tue Oct 13 14:40:28 2015 +0100 git:7a92036) EFI loader
	Synchronous Exception at 0x00000000FECB021C

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 005bb2b7a1..53c7452e50 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -635,8 +635,8 @@ static void __init efi_console_set_mode(void)
 static EFI_GRAPHICS_OUTPUT_PROTOCOL __init *efi_get_gop(void)
 {
     EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
-    EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
-    EFI_HANDLE *handles;
+    EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
+    EFI_HANDLE *handles = NULL;
     EFI_STATUS status;
     UINTN info_size, size = 0;
     static EFI_GUID __initdata gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;