From owner-svn-src-head@FreeBSD.ORG  Sun Feb 13 19:46:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 564DB106566B;
	Sun, 13 Feb 2011 19:46:55 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44D728FC14;
	Sun, 13 Feb 2011 19:46:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DJktc8049988;
	Sun, 13 Feb 2011 19:46:55 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DJktSM049986;
	Sun, 13 Feb 2011 19:46:55 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201102131946.p1DJktSM049986@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 13 Feb 2011 19:46:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218665 - head/sys/cddl/compat/opensolaris/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Feb 2011 19:46:55 -0000

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);
 }