diff options
| author | smh <smh@FreeBSD.org> | 2016-01-28 12:11:42 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2016-01-28 12:11:42 +0000 |
| commit | 634e73dbb861268bd122cc29b02b1a56df450dd6 (patch) | |
| tree | 7fd1c618154ccfb649dc2a3ef4b6030c01df8f81 /sys/boot/efi/loader/bootinfo.c | |
| parent | fe8f0aa165649acdaf27427ebefed487585a9d35 (diff) | |
| download | FreeBSD-src-634e73dbb861268bd122cc29b02b1a56df450dd6.zip FreeBSD-src-634e73dbb861268bd122cc29b02b1a56df450dd6.tar.gz | |
MFC r281169, r293724, r293796, r294029, r294041, r294058
MFC r281169 (by andrew):
Make global variabled only used in this file static
MFC r294058:
Make common boot file_loadraw name parameter const
MFC r294041:
Remove unused reg param from fdt_fixup_memory
MFC r293724:
Enable warnings in EFI boot code
MFC r293796:
Fix typo in libefi.c
MFC r294029:
Only build EFI components on supported compilers
Sponsored by: Multiplay
Diffstat (limited to 'sys/boot/efi/loader/bootinfo.c')
| -rw-r--r-- | sys/boot/efi/loader/bootinfo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/efi/loader/bootinfo.c b/sys/boot/efi/loader/bootinfo.c index 18837f8..3bc6e42 100644 --- a/sys/boot/efi/loader/bootinfo.c +++ b/sys/boot/efi/loader/bootinfo.c @@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$"); #include "framebuffer.h" #include "loader_efi.h" +int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp); + static const char howto_switches[] = "aCdrgDmphsv"; static int howto_masks[] = { RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE, @@ -113,7 +115,7 @@ bi_copyenv(vm_offset_t start) /* Traverse the environment. */ for (ep = environ; ep != NULL; ep = ep->ev_next) { len = strlen(ep->ev_name); - if (archsw.arch_copyin(ep->ev_name, addr, len) != len) + if ((size_t)archsw.arch_copyin(ep->ev_name, addr, len) != len) break; addr += len; if (archsw.arch_copyin("=", addr, 1) != 1) @@ -121,7 +123,7 @@ bi_copyenv(vm_offset_t start) addr++; if (ep->ev_value != NULL) { len = strlen(ep->ev_value); - if (archsw.arch_copyin(ep->ev_value, addr, len) != len) + if ((size_t)archsw.arch_copyin(ep->ev_value, addr, len) != len) break; addr += len; } |
