From owner-cvs-all@FreeBSD.ORG  Wed Nov 19 10:11:28 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E6FEF16A4CE; Wed, 19 Nov 2003 10:11:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5A80343FAF; Wed, 19 Nov 2003 10:11:28 -0800 (PST)
	(envelope-from peter@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAJIBSXJ073972;
	Wed, 19 Nov 2003 10:11:28 -0800 (PST)
	(envelope-from peter@repoman.freebsd.org)
Received: (from peter@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAJIBSra073971;
	Wed, 19 Nov 2003 10:11:28 -0800 (PST)
	(envelope-from peter)
Message-Id: <200311191811.hAJIBSra073971@repoman.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 19 Nov 2003 10:11:28 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/amd64/conf GENERIC
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2003 18:11:29 -0000

peter       2003/11/19 10:11:28 PST

  FreeBSD src repository

  Modified files:
    sys/amd64/conf       GENERIC 
  Log:
  Sync with i386.
  - turn on SMP in generic
  - add 'device atpic' - this is unconditional on i386, but certain nvidia
    based systems need to disable acpi because the reference bios seems to be
    hosed.  If acpi is disabled, we won't find the apic.  amd64 has the
    mptable code in a seperate compile option as well.
  - turn sym back on, it doesn't fail to compile anymore.
  
  Approved by: re
  
  Revision  Changes    Path
  1.398     +7 -3      src/sys/amd64/conf/GENERIC