From owner-svn-src-head@FreeBSD.ORG  Mon Oct 13 17:14:29 2008
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 D70C41065686;
	Mon, 13 Oct 2008 17:14:29 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C56228FC08;
	Mon, 13 Oct 2008 17:14:29 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DHETYo081376;
	Mon, 13 Oct 2008 17:14:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9DHET4q081375;
	Mon, 13 Oct 2008 17:14:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200810131714.m9DHET4q081375@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 13 Oct 2008 17:14:29 +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: r183825 - head/sys/boot/ofw/libofw
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: Mon, 13 Oct 2008 17:14:30 -0000

Author: nwhitehorn
Date: Mon Oct 13 17:14:29 2008
New Revision: 183825
URL: http://svn.freebsd.org/changeset/base/183825

Log:
  Don't close OF disk devices on PowerPC. This fixes loader when booting from
  disk on my Blue & White G3 system.

Modified:
  head/sys/boot/ofw/libofw/ofw_disk.c

Modified: head/sys/boot/ofw/libofw/ofw_disk.c
==============================================================================
--- head/sys/boot/ofw/libofw/ofw_disk.c	Mon Oct 13 16:46:24 2008	(r183824)
+++ head/sys/boot/ofw/libofw/ofw_disk.c	Mon Oct 13 17:14:29 2008	(r183825)
@@ -155,7 +155,9 @@ ofwd_close(struct open_file *f)
 			if (odp->count == 0) {
 				SLIST_REMOVE(&opened_devs, odp, opened_dev,
 				    link);
+			#if !defined(__powerpc__)
 				OF_close(odp->handle);
+			#endif
 				free(odp);
 			}
 			break;