Date: Sun, 3 Dec 2017 04:54:49 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326485 - in head/stand: ofw/libofw sparc64/loader Message-ID: <201712030454.vB34snLh056056@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Dec 3 04:54:49 2017 New Revision: 326485 URL: https://svnweb.freebsd.org/changeset/base/326485 Log: Delcare md_load in libofw.h. Make all prototypes match for ofw provided md_load functions. Sponsored by: Netflix Modified: head/stand/ofw/libofw/libofw.h head/stand/sparc64/loader/main.c head/stand/sparc64/loader/metadata.c Modified: head/stand/ofw/libofw/libofw.h ============================================================================== --- head/stand/ofw/libofw/libofw.h Sun Dec 3 04:54:18 2017 (r326484) +++ head/stand/ofw/libofw/libofw.h Sun Dec 3 04:54:49 2017 (r326485) @@ -67,6 +67,10 @@ struct file_format; int ofw_elf_loadfile(char *, vm_offset_t, struct preloaded_file **); int ofw_elf_exec(struct preloaded_file *); +/* MD code implementing MI interfaces */ +vm_offset_t md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtb); +vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); + extern struct file_format ofw_elf; #ifdef __powerpc__ extern struct file_format ofw_elf64; Modified: head/stand/sparc64/loader/main.c ============================================================================== --- head/stand/sparc64/loader/main.c Sun Dec 3 04:54:18 2017 (r326484) +++ head/stand/sparc64/loader/main.c Sun Dec 3 04:54:49 2017 (r326485) @@ -101,7 +101,6 @@ static inline u_long itlb_get_data_sun4u(u_int, u_int) static int itlb_enter_sun4u(u_int, u_long data, vm_offset_t); static vm_offset_t itlb_va_to_pa_sun4u(vm_offset_t); static void itlb_relocate_locked0_sun4u(void); -extern vm_offset_t md_load(char *, vm_offset_t *, vm_offset_t *); static int sparc64_autoload(void); static ssize_t sparc64_readin(const int, vm_offset_t, const size_t); static ssize_t sparc64_copyin(const void *, vm_offset_t, size_t); Modified: head/stand/sparc64/loader/metadata.c ============================================================================== --- head/stand/sparc64/loader/metadata.c Sun Dec 3 04:54:18 2017 (r326484) +++ head/stand/sparc64/loader/metadata.c Sun Dec 3 04:54:49 2017 (r326485) @@ -275,7 +275,7 @@ md_copymodules(vm_offset_t addr) * - The kernel environment is copied into kernel space. * - Module metadata are formatted and placed in kernel space. */ -int +vm_offset_t md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtbp) { struct preloaded_file *kfp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712030454.vB34snLh056056>