diff options
| author | dcs <dcs@FreeBSD.org> | 1999-03-20 14:13:09 +0000 |
|---|---|---|
| committer | dcs <dcs@FreeBSD.org> | 1999-03-20 14:13:09 +0000 |
| commit | 70ba7a32cefb960fe8a91e808bdaba943ecfe96d (patch) | |
| tree | c87eb6e6040edd357805ca6200699e33cfc845b0 /sys/boot/alpha | |
| parent | bde5fa25e5de0c86fe32ebef44d757be8f82b508 (diff) | |
| download | FreeBSD-src-70ba7a32cefb960fe8a91e808bdaba943ecfe96d.zip FreeBSD-src-70ba7a32cefb960fe8a91e808bdaba943ecfe96d.tar.gz | |
Revert bootinfo to 1.4 and use a different solution to NULL m_args
instead (don't copy).
Diffstat (limited to 'sys/boot/alpha')
| -rw-r--r-- | sys/boot/alpha/libalpha/bootinfo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c index 6062320..f4318c9 100644 --- a/sys/boot/alpha/libalpha/bootinfo.c +++ b/sys/boot/alpha/libalpha/bootinfo.c @@ -88,11 +88,10 @@ bi_copyenv(vm_offset_t addr) } #define MOD_STR(t, a, s) { \ - const char *p = s ? s : ""; \ COPY32(t, a); \ - COPY32(strlen(p) + 1, a); \ - alpha_copyin(p, a, strlen(p) + 1); \ - a += roundup(strlen(p) + 1, sizeof(u_int64_t));\ + COPY32(strlen(s) + 1, a); \ + alpha_copyin(s, a, strlen(s) + 1); \ + a += roundup(strlen(s) + 1, sizeof(u_int64_t));\ } #define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s) @@ -132,7 +131,8 @@ bi_copymodules(vm_offset_t addr) MOD_NAME(addr, mp->m_name); /* this field must come first */ MOD_TYPE(addr, mp->m_type); - MOD_ARGS(addr, mp->m_args); + 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) |
