From owner-svn-src-stable-8@FreeBSD.ORG  Fri Jan 15 12:07:30 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1F0B1065676;
	Fri, 15 Jan 2010 12:07:30 +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 8FE1E8FC15;
	Fri, 15 Jan 2010 12:07:30 +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 o0FC7UQr066303;
	Fri, 15 Jan 2010 12:07:30 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0FC7U4q066301;
	Fri, 15 Jan 2010 12:07:30 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201001151207.o0FC7U4q066301@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 15 Jan 2010 12:07:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202350 - stable/8/sys/boot/sparc64/loader
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jan 2010 12:07:30 -0000

Author: marius
Date: Fri Jan 15 12:07:30 2010
New Revision: 202350
URL: http://svn.freebsd.org/changeset/base/202350

Log:
  MFC: r200944
  
  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:
  stable/8/sys/boot/sparc64/loader/main.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/boot/sparc64/loader/main.c
==============================================================================
--- stable/8/sys/boot/sparc64/loader/main.c	Fri Jan 15 12:07:00 2010	(r202349)
+++ stable/8/sys/boot/sparc64/loader/main.c	Fri Jan 15 12:07:30 2010	(r202350)
@@ -261,7 +261,6 @@ static int
 sparc64_autoload(void)
 {
 
-	setenv("hw.ata.atapi_dma", "0", 0);
 	return (0);
 }