summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authordcs <dcs@FreeBSD.org>1999-03-18 14:36:22 +0000
committerdcs <dcs@FreeBSD.org>1999-03-18 14:36:22 +0000
commitc18006911ad9b00b65539ba68ec6c67e7e16551d (patch)
tree486be76d4715a6f1dc7083a6517e556ab2b756f1 /sys/boot
parent00ae7114acdd65ad3c0d4436a42c0240206bacb4 (diff)
downloadFreeBSD-src-c18006911ad9b00b65539ba68ec6c67e7e16551d.zip
FreeBSD-src-c18006911ad9b00b65539ba68ec6c67e7e16551d.tar.gz
Avoid copying m_args if none exists. (Perhaps this is a better solution,
Doug?)
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/libi386/bootinfo.c5
-rw-r--r--sys/boot/i386/libi386/bootinfo32.c5
-rw-r--r--sys/boot/i386/libi386/bootinfo64.c5
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 32d152a..87405f0 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bootinfo.c,v 1.16 1999/01/24 00:12:04 msmith Exp $
+ * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $
*/
#include <stand.h>
@@ -207,7 +207,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)
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index 32d152a..87405f0 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bootinfo.c,v 1.16 1999/01/24 00:12:04 msmith Exp $
+ * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $
*/
#include <stand.h>
@@ -207,7 +207,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)
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index 32d152a..87405f0 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bootinfo.c,v 1.16 1999/01/24 00:12:04 msmith Exp $
+ * $Id: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $
*/
#include <stand.h>
@@ -207,7 +207,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)
OpenPOWER on IntegriCloud