diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2023-06-27 17:19:32 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2023-06-27 17:19:32 +0000 |
| commit | b9f56cabeda4c05c8dec1dd0315ccea45f5739da (patch) | |
| tree | 6ab1ca508858f6457c325759e678a403fee07b9b /stand/efi | |
| parent | eca9714e4bf299cd704eb9e28a06a97d1bb1c301 (diff) | |
| download | src-b9f56cabeda4c05c8dec1dd0315ccea45f5739da.tar.gz src-b9f56cabeda4c05c8dec1dd0315ccea45f5739da.zip | |
efi loader: Move 'module' variable under #ifdef MODINFOMD_MODULEP.
This quiets a set but unused warning on platforms without this module
info such as aarch64.
Differential Revision: https://reviews.freebsd.org/D40672
Diffstat (limited to 'stand/efi')
| -rw-r--r-- | stand/efi/loader/bootinfo.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index d79f59343af1..6dad3868b840 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -334,7 +334,10 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) struct devdesc *rootdev; struct file_metadata *md; vm_offset_t addr; - uint64_t kernend, module; + uint64_t kernend; +#ifdef MODINFOMD_MODULEP + uint64_t module; +#endif uint64_t envp; vm_offset_t size; char *rootdevname; @@ -415,7 +418,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) kernend = 0; /* fill it in later */ /* Figure out the size and location of the metadata. */ - module = *modulep = addr; + *modulep = addr; file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof(howto), &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof(envp), &envp); @@ -428,6 +431,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend); #ifdef MODINFOMD_MODULEP + module = *modulep; file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module); #endif #ifdef EFI |