diff options
| author | msmith <msmith@FreeBSD.org> | 1998-09-14 18:27:06 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1998-09-14 18:27:06 +0000 |
| commit | 97d5b830761c0a62490a16c2f4942930afcbba94 (patch) | |
| tree | 9b227328959ed217910f704d659822fa67002976 /sys/boot/alpha | |
| parent | 34e8f6424cbf5128e7dc3149486965dd4e17c6fe (diff) | |
| download | FreeBSD-src-97d5b830761c0a62490a16c2f4942930afcbba94.zip FreeBSD-src-97d5b830761c0a62490a16c2f4942930afcbba94.tar.gz | |
Resynch with working sources before BTX integration.
- Use format-independant module allocator.
- Conditionalise ISA PnP support.
- Simplify PnP enumerator interface.
- Improve module/object searching.
- Add missing depend/install targets in BTX makefiles.
- Pass the kernel environment and module data in extended bootinfo fields.
- Add a pointer to the end of the kernel + modules in bootinfo.
- Fix parsing of old-style kernel arguments.
Diffstat (limited to 'sys/boot/alpha')
| -rw-r--r-- | sys/boot/alpha/libalpha/elf_freebsd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c index b2e59ae..402266b 100644 --- a/sys/boot/alpha/libalpha/elf_freebsd.c +++ b/sys/boot/alpha/libalpha/elf_freebsd.c @@ -1,4 +1,4 @@ -/* $Id: elf_freebsd.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */ +/* $Id: elf_freebsd.c,v 1.2 1998/08/31 21:10:40 msmith Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -130,11 +130,10 @@ elf_loadmodule(char *filename, vm_offset_t dest, struct loaded_module **result) /* * Ok, we think this is for us. */ - mp = malloc(sizeof(struct loaded_module)); + mp = mod_allocmodule(); mp->m_name = strdup(filename); /* XXX should we prune the name? */ mp->m_type = strdup("elf kernel"); /* XXX only if that's what we really are */ - mp->m_args = NULL; /* XXX should we put the bootstrap args here and parse later? */ - mp->m_metadata = NULL; + dest = (vm_offset_t) hdr.e_entry; mp->m_addr = dest; if (mod_findmodule(NULL, NULL) != NULL) { |
