diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-04-19 11:59:01 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-05-01 07:37:32 +0200 |
| commit | a55039d6a847d8c83ea2175e09d3eed6d7d83571 (patch) | |
| tree | f95a0bfe0f170b0d027189eaed9b034da4e55220 | |
| parent | ff0de1f0557ed7d2dab47ba976a37347a1fdc432 (diff) | |
| download | u-boot-a55039d6a847d8c83ea2175e09d3eed6d7d83571.zip u-boot-a55039d6a847d8c83ea2175e09d3eed6d7d83571.tar.gz u-boot-a55039d6a847d8c83ea2175e09d3eed6d7d83571.tar.bz2 | |
efi_loader: superfluous efi_restore_gd after EFI_CALL
EFI_CALL() invokes __efi_entry_check() which executes set_gd(efi_gd).
There is no need to execute set_gd(efi_gd) again via efi_restore_gd().
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| -rw-r--r-- | cmd/bootefi.c | 1 | ||||
| -rw-r--r-- | cmd/efidebug.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_helper.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 578dbb1..c1454ff 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -107,7 +107,6 @@ static int do_efi_selftest(void) /* Execute the test */ ret = EFI_CALL(efi_selftest(&image_obj->header, &systab)); - efi_restore_gd(); free(loaded_image_info->load_options); efi_free_pool(test_device_path); efi_free_pool(test_image_path); diff --git a/cmd/efidebug.c b/cmd/efidebug.c index a587860..d1f86e7 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1404,8 +1404,6 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag, if (ret && exit_data) efi_free_pool(exit_data); - efi_restore_gd(); - free(load_options); return CMD_RET_SUCCESS; } diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 6918fd5..9d7f82f 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -544,8 +544,6 @@ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) } } - efi_restore_gd(); - out: free(load_options); |