From owner-svn-src-all@FreeBSD.ORG  Mon Aug 13 21:04:02 2012
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 6727B106566B;
	Mon, 13 Aug 2012 21:04:02 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5210D8FC0C;
	Mon, 13 Aug 2012 21:04:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DL42X8093685;
	Mon, 13 Aug 2012 21:04:02 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7DL42dl093683;
	Mon, 13 Aug 2012 21:04:02 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208132104.q7DL42dl093683@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 13 Aug 2012 21:04:02 +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: r239243 - head/sys/boot/i386/libi386
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: Mon, 13 Aug 2012 21:04:02 -0000

Author: dim
Date: Mon Aug 13 21:04:01 2012
New Revision: 239243
URL: http://svn.freebsd.org/changeset/base/239243

Log:
  After r239066, reinitialize v86.ctl and v86.addr for int 13 EDD probing
  in sys/boot/i386/libi386/biosdisk.c.  Otherwise, when DISK_DEBUG is
  enabled, the DEBUG() macros will clobber those fields, and cause the
  probing to always fail mysteriously when debugging is enabled.

Modified:
  head/sys/boot/i386/libi386/biosdisk.c

Modified: head/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- head/sys/boot/i386/libi386/biosdisk.c	Mon Aug 13 19:14:45 2012	(r239242)
+++ head/sys/boot/i386/libi386/biosdisk.c	Mon Aug 13 21:04:01 2012	(r239243)
@@ -215,6 +215,8 @@ bd_int13probe(struct bdinfo *bd)
 	    bd->bd_hds, bd->bd_sec);
 
 	/* Determine if we can use EDD with this device. */
+	v86.ctl = V86_FLAGS;
+	v86.addr = 0x13;
 	v86.eax = 0x4100;
 	v86.edx = bd->bd_unit;
 	v86.ebx = 0x55aa;