head	1.1;
access;
symbols
	RELENG_6_4_0_RELEASE:1.1.6.2.4.1
	RELENG_6_4:1.1.6.2.0.4
	RELENG_6_4_BP:1.1.6.2
	RELENG_6_3_0_RELEASE:1.1.6.2
	RELENG_6_3:1.1.6.2.0.2
	RELENG_6_3_BP:1.1.6.2
	RELENG_6_2_0_RELEASE:1.1.6.1
	RELENG_6_2:1.1.6.1.0.6
	RELENG_6_2_BP:1.1.6.1
	RELENG_5_5_0_RELEASE:1.1.2.1
	RELENG_5_5:1.1.2.1.0.4
	RELENG_5_5_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1.6.1
	RELENG_6_1:1.1.6.1.0.4
	RELENG_6_1_BP:1.1.6.1
	RELENG_6_0_0_RELEASE:1.1.6.1
	RELENG_6_0:1.1.6.1.0.2
	RELENG_6_0_BP:1.1.6.1
	RELENG_6:1.1.0.6
	RELENG_5_4_0_RELEASE:1.1.2.1
	RELENG_5_4:1.1.2.1.0.2
	RELENG_5_4_BP:1.1.2.1
	RELENG_5_3_0_RELEASE:1.1.4.1
	RELENG_5_3:1.1.0.4
	RELENG_5:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2004.10.23.19.58.27;	author kensmith;	state dead;
branches
	1.1.2.1
	1.1.4.1
	1.1.6.1;
next	;

1.1.2.1
date	2004.10.23.19.58.27;	author kensmith;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2007.03.03.23.20.42;	author cperciva;	state Exp;
branches;
next	;

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

1.1.6.1
date	2005.09.18.03.37.58;	author scottl;	state Exp;
branches;
next	1.1.6.2;

1.1.6.2
date	2007.03.03.23.19.46;	author cperciva;	state Exp;
branches
	1.1.6.2.4.1;
next	1.1.6.3;

1.1.6.3
date	2012.11.17.07.42.21;	author svnexp;	state Exp;
branches;
next	;

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


desc
@@


1.1
log
@file SMP was initially added on branch RELENG_5.
@
text
@@


1.1.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
@a0 9
#
# SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
#	 Use this for multi-processor machines
#
# $FreeBSD$

include GENERIC

options	SMP
@


1.1.6.2
log
@MFi386: Ident the SMP kernel as SMP-GENERIC (not GENERIC).
@
text
@a8 2
ident	SMP-GENERIC

@


1.1.6.3
log
@Switch importer
@
text
@d5 1
a5 1
# $FreeBSD: stable/6/sys/amd64/conf/SMP 167188 2007-03-03 23:20:42Z cperciva $
@


1.1.6.2.4.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.1.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
@a0 9
#
# SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
#	 Use this for multi-processor machines
#
# $FreeBSD$

include GENERIC

options	SMP
@


1.1.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
@a0 9
#
# SMP -- Generic kernel configuration file for FreeBSD/amd64 SMP
#	 Use this for multi-processor machines
#
# $FreeBSD$

include GENERIC

options	SMP
@


1.1.2.2
log
@MFi386: Ident the SMP kernel as SMP-GENERIC (not GENERIC).
@
text
@a8 2
ident	SMP-GENERIC

@


