From owner-svn-src-all@FreeBSD.ORG  Fri Oct 29 18:38:36 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 C6E91106564A;
	Fri, 29 Oct 2010 18:38:36 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B50698FC12;
	Fri, 29 Oct 2010 18:38:36 +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 o9TIca0G049154;
	Fri, 29 Oct 2010 18:38:36 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9TIcaGd049152;
	Fri, 29 Oct 2010 18:38:36 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201010291838.o9TIcaGd049152@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 29 Oct 2010 18:38:36 +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: r214516 - head/sys/conf
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 18:38:36 -0000

Author: attilio
Date: Fri Oct 29 18:38:36 2010
New Revision: 214516
URL: http://svn.freebsd.org/changeset/base/214516

Log:
  Merging mptable under x86 left this option undefined for amd64 case.
  Fix that.
  
  Sponsored by:	Sandvine Incorporated
  Reported by:	jkim

Modified:
  head/sys/conf/options.amd64

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64	Fri Oct 29 18:33:43 2010	(r214515)
+++ head/sys/conf/options.amd64	Fri Oct 29 18:38:36 2010	(r214516)
@@ -8,6 +8,7 @@ COUNT_IPIS		opt_smp.h
 MAXMEM
 PERFMON
 PMAP_SHPGPERPROC	opt_pmap.h
+MPTABLE_FORCE_HTT
 MP_WATCHDOG
 
 # Options for emulators.  These should only be used at config time, so