From owner-svn-src-all@FreeBSD.ORG  Sun Aug  8 06:18:06 2010
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 29AD21065673;
	Sun,  8 Aug 2010 06:18:06 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A33EE8FC1C;
	Sun,  8 Aug 2010 06:18:05 +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 o786I5Um080002;
	Sun, 8 Aug 2010 06:18:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o786I51D079999;
	Sun, 8 Aug 2010 06:18:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201008080618.o786I51D079999@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Sun, 8 Aug 2010 06:18:05 +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: r211058 - in head/sys: conf modules/x86bios
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: Sun, 08 Aug 2010 06:18:06 -0000

Author: jkim
Date: Sun Aug  8 06:18:05 2010
New Revision: 211058
URL: http://svn.freebsd.org/changeset/base/211058

Log:
  Do not build real mode emulator for i386.  We use VM86 again since r210877.

Modified:
  head/sys/conf/files.i386
  head/sys/modules/x86bios/Makefile

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Sun Aug  8 02:51:32 2010	(r211057)
+++ head/sys/conf/files.i386	Sun Aug  8 06:18:05 2010	(r211058)
@@ -369,10 +369,9 @@ i386/xbox/xboxfb.c		optional xboxfb
 dev/fb/boot_font.c		optional xboxfb
 i386/xbox/pic16l.s		optional xbox
 #
-# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+# x86 real mode BIOS support, required by atkbdc/dpms/vesa
 #
 compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
 #
 # x86 shared code between IA32, AMD64 and PC98 architectures
 #

Modified: head/sys/modules/x86bios/Makefile
==============================================================================
--- head/sys/modules/x86bios/Makefile	Sun Aug  8 02:51:32 2010	(r211057)
+++ head/sys/modules/x86bios/Makefile	Sun Aug  8 06:18:05 2010	(r211058)
@@ -6,6 +6,9 @@ SRCS+=	bus_if.h device_if.h pci_if.h
 
 .PATH:	${.CURDIR}/../../contrib/x86emu
 .PATH:	${.CURDIR}/../../compat/x86bios
-SRCS+=	x86bios.c x86emu.c
+SRCS+=	x86bios.c
+.if ${MACHINE_ARCH} != "i386"
+SRCS+=	x86emu.c
+.endif
 
 .include <bsd.kmod.mk>