head	1.5;
access;
symbols
	RELENG_6_4_0_RELEASE:1.5.6.1.10.1
	RELENG_6_4:1.5.6.1.0.10
	RELENG_6_4_BP:1.5.6.1
	RELENG_6_3_0_RELEASE:1.5.6.1
	RELENG_6_3:1.5.6.1.0.8
	RELENG_6_3_BP:1.5.6.1
	RELENG_6_2_0_RELEASE:1.5.6.1
	RELENG_6_2:1.5.6.1.0.6
	RELENG_6_2_BP:1.5.6.1
	RELENG_5_5_0_RELEASE:1.5.2.3
	RELENG_5_5:1.5.2.3.0.4
	RELENG_5_5_BP:1.5.2.3
	RELENG_6_1_0_RELEASE:1.5.6.1
	RELENG_6_1:1.5.6.1.0.4
	RELENG_6_1_BP:1.5.6.1
	RELENG_6_0_0_RELEASE:1.5.6.1
	RELENG_6_0:1.5.6.1.0.2
	RELENG_6_0_BP:1.5.6.1
	RELENG_6:1.5.0.6
	RELENG_5_4_0_RELEASE:1.5.2.3
	RELENG_5_4:1.5.2.3.0.2
	RELENG_5_4_BP:1.5.2.3
	RELENG_5_3_0_RELEASE:1.5.4.1
	RELENG_5_3:1.5.0.4
	RELENG_5:1.5.0.2
	RELENG_5_1_0_RELEASE:1.4
	RELENG_5_1:1.4.0.2
	RELENG_5_1_BP:1.4;
locks; strict;
comment	@# @;


1.5
date	2003.11.03.22.49.51;	author jhb;	state dead;
branches
	1.5.2.1
	1.5.4.1
	1.5.6.1;
next	1.4;

1.4
date	2003.03.26.19.49.34;	author ps;	state Exp;
branches;
next	1.3;

1.3
date	2003.03.25.23.31.14;	author jhb;	state Exp;
branches;
next	1.2;

1.2
date	2002.12.30.11.36.17;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	2002.12.30.11.31.58;	author obrien;	state Exp;
branches;
next	;

1.5.2.1
date	2004.10.23.19.58.27;	author kensmith;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	2005.01.17.10.27.21;	author obrien;	state Exp;
branches;
next	1.5.2.3;

1.5.2.3
date	2005.02.06.12.56.27;	author obrien;	state Exp;
branches;
next	;

1.5.4.1
date	2004.10.23.20.04.00;	author kensmith;	state Exp;
branches;
next	;

1.5.6.1
date	2005.09.18.03.37.58;	author scottl;	state Exp;
branches
	1.5.6.1.10.1;
next	1.5.6.2;

1.5.6.2
date	2012.11.17.07.43.51;	author svnexp;	state Exp;
branches;
next	;

1.5.6.1.10.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Remove the SMP kernel config as SMP is now enabled in GENERIC.
@
text
@#
# SMP -- Generic kernel configuration file for FreeBSD/i386 SMP 
#
# $FreeBSD: src/sys/i386/conf/SMP,v 1.4 2003/03/26 19:49:34 ps Exp $

include GENERIC

ident		SMP-GENERIC

# To make an SMP kernel, the next two are needed
options 	SMP			# Symmetric MultiProcessor Kernel
options 	APIC_IO			# Symmetric (APIC) I/O
@


1.5.6.1
log
@Now that our showstopper list has shrunk, take another step closer to the
release and turn off kernel debugging.  Also turn off SMP on i386 and amd64
and add an SMP kernel config.

Approved by: re (implicit)
@
text
@d2 1
a2 2
# SMP -- Generic kernel configuration file for FreeBSD/i386 SMP
#	 Use this for multi-processor machines
d4 1
a4 1
# $FreeBSD$
d10 1
a10 1
# To make an SMP kernel, the next line is needed
d12 1
@


1.5.6.2
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: stable/6/sys/i386/conf/SMP 150272 2005-09-18 03:37:59Z scottl $
@


1.5.6.1.10.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.5.4.1
log
@MFR5 shifting GENERIC back to UP instead of MP which should be a little
     safer for installs and gives the majority of users the correct (faster)
     kernel.

Revs MFR5'd:

> Revision   Changes    Path
> 1.421.2.5  +0 -2      src/sys/amd64/conf/GENERIC
> 1.1.2.1    +9 -0      src/sys/amd64/conf/SMP (new)
> 1.413.2.7  +0 -2      src/sys/i386/conf/GENERIC
> 1.5.2.1    +9 -0      src/sys/i386/conf/SMP (new)

Discussed by:	re@@
Approved by:	re (scottl)
@
text
@d2 1
a2 2
# SMP -- Generic kernel configuration file for FreeBSD/i386 SMP
#	 Use this for multi-processor machines
d4 1
a4 1
# $FreeBSD$
d8 5
a12 1
options	SMP
@


1.5.2.1
log
@To be safe for installs as well as providing the faster kernel for the
majority of users shift GENERIC back to UP instead of SMP.  Provide
a config file people with MP boxes can use.

Discussed by:	re@@
Approved by:	re (scottl)
@
text
@d2 1
a2 2
# SMP -- Generic kernel configuration file for FreeBSD/i386 SMP
#	 Use this for multi-processor machines
d4 1
a4 1
# $FreeBSD$
d8 5
a12 1
options	SMP
@


1.5.2.2
log
@Ident the SMP kernel as SMP-GENERIC.
@
text
@d9 1
a9 4
ident		SMP-GENERIC

# To make an SMP kernel, the next two lines are needed
options 	SMP			# Symmetric MultiProcessor Kernel
@


1.5.2.3
log
@Correct the English.
@
text
@d11 1
a11 1
# To make an SMP kernel, the next line is needed
@


1.4
log
@Nuke options HTT infavor of machdep.hlt_logical_cpus tunable/sysctl.
This keeps the logical cpu's halted in the idle loop.  By default
the logical cpu's are halted at startup.  It is also possible to
halt any cpu in the idle loop now using machdep.hlt_cpus.

Examples of how to use this:
machdep.hlt_cpus=1	halt cpu0
machdep.hlt_cpus=2	halt cpu1
machdep.hlt_cpus=4	halt cpu2
machdep.hlt_cpus=3	halt cpu0,cpu1

Reviewed by:	jhb, peter
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.3
log
@Add an options entry for HTT in SMP and GENERIC similar to the SMP and
APIC_IO options.

Requested by:	John Cagle <john.cagle@@hp.com>
@
text
@a12 3

# To support HyperThreading, HTT is needed in addition to SMP and APIC_IO
options 	HTT			# HyperThreading Technology
@


1.2
log
@Change the ident so people know a kernel built with this has SMP support.
@
text
@d13 3
@


1.1
log
@Using our new wonderful include directive, save our x86 SMP users from
having to edit GENERIC to build a useful kernel.  This also opens the
possibility of including an SMP kernel in the release.
@
text
@d8 2
@

