efi_loader: fix efi_exit

PATCH Applied Rob Clark 2 participants 2 messages Sep 20, 2017 – Sep 21, 2017

lore

Share & tools

lore

Rob Clark

author

2017-09-20 22:23 UTC #0 lore raw

PATCH 1/1 efi_loader: fix efi_exit

efi_exit() already restores gd, so we shouldn't EFI_EXIT() on the otherside of the longjmp().

Signed-off-by Rob Clark <[email protected]>

---
 cmd/bootefi.c | 1 -
 1 file changed, 1 deletion(-)

cmd/bootefi.c +0 -1

index fdfed1be05..a049e5f64d 100644
@@ -191,7 +191,6 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt,
 
 	if (setjmp(&loaded_image_info.exit_jmp)) {
 		ret = loaded_image_info.exit_status;
-		EFI_EXIT(ret);
 		goto exit;
 	}

Signature · 1 line

2.13.5

Alexander Graf

Applied

2017-09-21 07:04 UTC #1 lore raw

Quoted 4 lines

efi_exit() already restores gd, so we shouldn't EFI_EXIT() on the otherside of the longjmp().
Signed-off-by Rob Clark <[email protected]>

Thanks, applied to efi-next

Alex