From owner-svn-src-all@FreeBSD.ORG  Fri Oct 29 17:39:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from [127.0.0.1] (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by hub.freebsd.org (Postfix) with ESMTP id 8C964106566B;
	Fri, 29 Oct 2010 17:39:36 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
From: Jung-uk Kim <jkim@FreeBSD.org>
To: src-committers@FreeBSD.org
Date: Fri, 29 Oct 2010 13:39:13 -0400
User-Agent: KMail/1.6.2
References: <201010280758.o9S7w6Vj069186@svn.freebsd.org>
In-Reply-To: <201010280758.o9S7w6Vj069186@svn.freebsd.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201010291339.18565.jkim@FreeBSD.org>
Cc: Attilio Rao <attilio@freebsd.org>, svn-src-head@freebsd.org,
	svn-src-all@freebsd.org
Subject: Re: svn commit: r214446 - in head/sys: amd64/amd64 conf i386/i386
	x86/x86
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: Fri, 29 Oct 2010 17:39:37 -0000

On Thursday 28 October 2010 03:58 am, Attilio Rao wrote:
> Author: attilio
> Date: Thu Oct 28 07:58:06 2010
> New Revision: 214446
> URL: http://svn.freebsd.org/changeset/base/214446
>
> Log:
>   Merge the mptable support from MD bits to x86 subtree.
>
>   Sponsored by:	Sandvine Incorporated
>   Discussed with:	jhb

This commit broke amd64 build with "device mptable".  I had to do the 
following to fix sys/x86/x86/mptable.c:

@@ -27,7 +27,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef __i386__
 #include "opt_mptable_force_htt.h"
+#endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>

Alternatively, you may add "MPTABLE_FORCE_HTT" in 
sys/conf/options.amd64 but I am not sure this option is useful for 
amd64.

Jung-uk Kim