diff options
| author | peter <peter@FreeBSD.org> | 1998-09-28 22:01:20 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-09-28 22:01:20 +0000 |
| commit | 51b3ea754e5f8ee3000a2b2f0e6506c7fd609a4e (patch) | |
| tree | f8ef1906a0351672cd982953be0ced539db26643 | |
| parent | 6f52c26500b7567034116ba7459895aa0e270b37 (diff) | |
| download | FreeBSD-src-51b3ea754e5f8ee3000a2b2f0e6506c7fd609a4e.zip FreeBSD-src-51b3ea754e5f8ee3000a2b2f0e6506c7fd609a4e.tar.gz | |
Reactivate the a.out kernel loader code.
| -rw-r--r-- | sys/boot/i386/libi386/aout_freebsd.c | 4 | ||||
| -rw-r--r-- | sys/boot/i386/loader/conf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/i386/libi386/aout_freebsd.c b/sys/boot/i386/libi386/aout_freebsd.c index 674e243..1c709a7 100644 --- a/sys/boot/i386/libi386/aout_freebsd.c +++ b/sys/boot/i386/libi386/aout_freebsd.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aout_freebsd.c,v 1.3 1998/09/14 18:27:05 msmith Exp $ + * $Id: aout_freebsd.c,v 1.4 1998/09/17 23:52:07 msmith Exp $ */ #include <sys/param.h> @@ -102,7 +102,7 @@ aout_exec(struct loaded_module *mp) argv[2] = 0; /* old cyloffset */ argv[3] = 0; /* old esym */ argv[4] = 0; /* "new" bootinfo magic */ - argv[5] = (u_int32_t)vtophys(&bi); + argv[5] = (u_int32_t)VTOP(&bi); /* find the last module in the chain */ for (xp = mp; xp->m_next != NULL; xp = xp->m_next) diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c index 92e25bb..ac57d06 100644 --- a/sys/boot/i386/loader/conf.c +++ b/sys/boot/i386/loader/conf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: conf.c,v 1.3 1998/09/17 23:52:15 msmith Exp $ + * $Id: conf.c,v 1.4 1998/09/18 02:03:30 msmith Exp $ */ #include <stand.h> @@ -65,7 +65,7 @@ struct fs_ops *file_system[] = { extern struct module_format i386_aout; struct module_format *module_formats[] = { -/* &i386_aout, XXX BTX */ + &i386_aout, NULL }; |
