From owner-p4-projects@FreeBSD.ORG  Thu Jul 21 21:34:55 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D848616A43D; Thu, 21 Jul 2005 21:34:54 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 9695F16A42A
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:34:54 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B0BC43D53
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:34:37 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6LLYbBI026716
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:34:37 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6LLYane026713
	for perforce@freebsd.org; Thu, 21 Jul 2005 21:34:36 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 21 Jul 2005 21:34:36 GMT
Message-Id: <200507212134.j6LLYane026713@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>
Cc: 
Subject: PERFORCE change 80706 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 21 Jul 2005 21:34:56 -0000

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

Change 80706 by peter@peter_daintree on 2005/07/21 21:33:53

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#77 integrate
.. //depot/projects/hammer/sys/amd64/include/atomic.h#18 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#77 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1202)
+# (XXX from i386:NOTES,v 1.1204)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.38 2005/07/21 00:18:28 jkim Exp $
 #
 
@@ -297,6 +297,8 @@
 #
 # Miscellaneous hardware:
 #
+# smbios: DMI/SMBIOS entry point
+# vpd: Vital Product Data kernel interface
 # cy: Cyclades serial driver
 # digi: Digiboard driver
 # smbios: DMI/SMBIOS entry point
@@ -323,6 +325,7 @@
 hint.pbio.0.at="isa"
 hint.pbio.0.port="0x360"
 device		smbios
+device		vpd
 # sx device is i386 and pc98 only at the moment.
 device		sx
 options 	SX_DEBUG

==== //depot/projects/hammer/sys/amd64/include/atomic.h#18 (text+ko) ====