Date: Fri, 1 May 2015 20:35:10 +0000 (UTC) From: Andreas Tobler <andreast@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282320 - head/sys/boot/sparc64/loader Message-ID: <201505012035.t41KZAoZ063600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andreast Date: Fri May 1 20:35:09 2015 New Revision: 282320 URL: https://svnweb.freebsd.org/changeset/base/282320 Log: Fix the loader for sparc64. The commit from r279799 missed the adaptation of md_load in sparc64/loader/main.c. This resulted in Memory Address Align issues at the early boot stage. Tested on a netbooted Fire 120. Modified: head/sys/boot/sparc64/loader/main.c Modified: head/sys/boot/sparc64/loader/main.c ============================================================================== --- head/sys/boot/sparc64/loader/main.c Fri May 1 20:25:47 2015 (r282319) +++ head/sys/boot/sparc64/loader/main.c Fri May 1 20:35:09 2015 (r282320) @@ -101,7 +101,7 @@ static inline u_long itlb_get_data_sun4u 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 *); +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); @@ -340,7 +340,7 @@ static int __elfN(exec)(struct preloaded_file *fp) { struct file_metadata *fmp; - vm_offset_t mdp; + vm_offset_t mdp, dtbp; Elf_Addr entry; Elf_Ehdr *e; int error; @@ -349,7 +349,7 @@ __elfN(exec)(struct preloaded_file *fp) return (EFTYPE); e = (Elf_Ehdr *)&fmp->md_data; - if ((error = md_load(fp->f_args, &mdp)) != 0) + if ((error = md_load(fp->f_args, &mdp, &dtbp)) != 0) return (error); printf("jumping to kernel entry at %#lx.\n", e->e_entry);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505012035.t41KZAoZ063600>