26c26
< * $FreeBSD: head/sys/boot/i386/libi386/bootinfo32.c 59087 2000-04-08 01:22:14Z ps $
---
> * $FreeBSD: head/sys/boot/i386/libi386/bootinfo32.c 59854 2000-05-01 17:41:25Z bp $
206,207c206,207
< struct loaded_module *mp;
< struct module_metadata *md;
---
> struct preloaded_file *fp;
> struct file_metadata *md;
210c210
< for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) {
---
> for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) {
212,218c212,218
< MOD_NAME(addr, mp->m_name); /* this field must come first */
< MOD_TYPE(addr, mp->m_type);
< if (mp->m_args)
< MOD_ARGS(addr, mp->m_args);
< MOD_ADDR(addr, mp->m_addr);
< MOD_SIZE(addr, mp->m_size);
< for (md = mp->m_metadata; md != NULL; md = md->md_next)
---
> MOD_NAME(addr, fp->f_name); /* this field must come first */
> MOD_TYPE(addr, fp->f_type);
> if (fp->f_args)
> MOD_ARGS(addr, fp->f_args);
> MOD_ADDR(addr, fp->f_addr);
> MOD_SIZE(addr, fp->f_size);
> for (md = fp->f_metadata; md != NULL; md = md->md_next)
238c238
< struct loaded_module *xp;
---
> struct preloaded_file *xp;
298,300c298,300
< for (xp = mod_findmodule(NULL, NULL); xp != NULL; xp = xp->m_next) {
< if (addr < (xp->m_addr + xp->m_size))
< addr = xp->m_addr + xp->m_size;
---
> for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) {
> if (addr < (xp->f_addr + xp->f_size))
> addr = xp->f_addr + xp->f_size;