From owner-svn-src-all@FreeBSD.ORG  Thu Dec 24 15:14:35 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7AAF106574F;
	Thu, 24 Dec 2009 15:14:35 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97F9A8FC0C;
	Thu, 24 Dec 2009 15:14:35 +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 nBOFEZbN033673;
	Thu, 24 Dec 2009 15:14:35 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBOFEZbS033671;
	Thu, 24 Dec 2009 15:14:35 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200912241514.nBOFEZbS033671@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 24 Dec 2009 15:14:35 +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: r200944 - head/sys/boot/sparc64/loader
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Dec 2009 15:14:35 -0000

Author: marius
Date: Thu Dec 24 15:14:35 2009
New Revision: 200944
URL: http://svn.freebsd.org/changeset/base/200944

Log:
  Revert r183628 as with the current ata(4) ATAPI DMA with AcerLabs
  M5229 appears to be once again fixed. If this happens to return
  we probably should disable ATAPI DMA in ataacerlabs(4) instead
  just like the Linux libATA does.

Modified:
  head/sys/boot/sparc64/loader/main.c

Modified: head/sys/boot/sparc64/loader/main.c
==============================================================================
--- head/sys/boot/sparc64/loader/main.c	Thu Dec 24 15:14:22 2009	(r200943)
+++ head/sys/boot/sparc64/loader/main.c	Thu Dec 24 15:14:35 2009	(r200944)
@@ -261,7 +261,6 @@ static int
 sparc64_autoload(void)
 {
 
-	setenv("hw.ata.atapi_dma", "0", 0);
 	return (0);
 }