From owner-p4-projects@FreeBSD.ORG  Mon Aug 30 23:42:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7446216A4D1; Mon, 30 Aug 2004 23:42:20 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4D0EE16A4CE
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 23:42:20 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 41D1043D1F
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 23:42:20 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7UNgK6W033904
	for <perforce@freebsd.org>; Mon, 30 Aug 2004 23:42:20 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7UNgJI0033901
	for perforce@freebsd.org; Mon, 30 Aug 2004 23:42:19 GMT
	(envelope-from peter@freebsd.org)
Date: Mon, 30 Aug 2004 23:42:19 GMT
Message-Id: <200408302342.i7UNgJI0033901@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 60740 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Aug 2004 23:42:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=60740

Change 60740 by peter@peter_daintree on 2004/08/30 23:41:47

	IFC @60739 (death by 1000 ifc-cuts)

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#70 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#55 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#32 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#70 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.244 2004/08/28 00:49:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.245 2004/08/30 23:33:33 peter Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"

==== //depot/projects/hammer/sys/conf/files.amd64#55 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.47 2004/08/16 12:51:33 obrien Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.48 2004/08/30 23:33:33 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/hammer/sys/conf/options.amd64#32 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.16 2004/08/16 11:09:59 obrien Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.17 2004/08/30 23:33:33 peter Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h