summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2011-02-13 19:46:55 +0000
committermarcel <marcel@FreeBSD.org>2011-02-13 19:46:55 +0000
commita77e48c8273af2a9218aa460cd04acc71780c2a5 (patch)
tree2f90839f24e6ae3697af55684a21196a54b67b6b
parent31f3b74d2338d597c3d86e8b2a7ace56b59c2848 (diff)
downloadFreeBSD-src-a77e48c8273af2a9218aa460cd04acc71780c2a5.zip
FreeBSD-src-a77e48c8273af2a9218aa460cd04acc71780c2a5.tar.gz
Use the preload_fetch_addr() and preload_fetch_size() convenience
functions to obtain the address and size of the preloaded pool configuration file/repository. Sponsored by: Juniper Networks.
-rw-r--r--sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c b/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
index d794345..cf1b390 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
@@ -200,10 +200,9 @@ kobj_read_file_loader(struct _buf *file, char *buf, unsigned size, unsigned off)
{
char *ptr;
- ptr = preload_search_info(file->ptr, MODINFO_ADDR);
+ ptr = preload_fetch_addr(file->ptr);
if (ptr == NULL)
return (ENOENT);
- ptr = *(void **)ptr;
bcopy(ptr + off, buf, size);
return (0);
}
OpenPOWER on IntegriCloud