From owner-svn-src-head@freebsd.org Sun Dec 3 04:54:51 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 047D4DEDFE0; Sun, 3 Dec 2017 04:54:51 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C562A6A830; Sun, 3 Dec 2017 04:54:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB34snWj056059; Sun, 3 Dec 2017 04:54:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB34snLh056056; Sun, 3 Dec 2017 04:54:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712030454.vB34snLh056056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 3 Dec 2017 04:54:49 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: ofw/libofw sparc64/loader X-SVN-Commit-Revision: 326485 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Dec 2017 04:54:51 -0000 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;