svn commit: r218665 - head/sys/cddl/compat/opensolaris/kern

[Marcel Moolenaar]

Author: marcel
Date: Sun Feb 13 19:46:55 2011
New Revision: 218665
URL: http://svn.freebsd.org/changeset/base/218665

Log:
  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.

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c	Sun Feb 13 19:37:05 2011	(r218664)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c	Sun Feb 13 19:46:55 2011	(r218665)
@@ -200,10 +200,9 @@ kobj_read_file_loader(struct _buf *file,
 {
 	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);
 }