summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2019-02-24 05:09:26 +0100
committerHeinrich Schuchardt <xypron.glpk@gmx.de>2019-02-25 12:39:48 +0100
commitccecc3456a6c538626b34be40249bcf88279efcf (patch)
treece7ea6e40ab27cdabce6ed2bb2565dd1863d0a98
parent33e44971a203dbadae0b7513135105b5bec156aa (diff)
efi_loader: fix entry count in bootmgr
Since commit 914df75b0c97 ("efi_loader: fix EFI entry counting") entry_count is already set to 1 before efi_bootmgr_load() is called. So we should not increment it when entering the function. Without the patch an assert error occurs in efi_get_variable() if DEBUG is defined. Fixes: 914df75b0c97 ("efi_loader: fix EFI entry counting") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
-rw-r--r--lib/efi_loader/efi_bootmgr.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index f4b1889dc6..6b68496a80 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -178,8 +178,6 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
void *image = NULL;
int i, num;
- __efi_entry_check();
-
bs = systab.boottime;
rs = systab.runtime;
@@ -200,7 +198,5 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
free(bootorder);
error:
- __efi_exit_check();
-
return image;
}