svn commit: r214446 - in head/sys: amd64/amd64 conf i386/i386 x86/x86

[Jung-uk Kim]

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