From owner-p4-projects@FreeBSD.ORG  Tue May 24 19:41:14 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 340D716A420; Tue, 24 May 2005 19:41:14 +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 E56BA16A41C
	for <perforce@freebsd.org>; Tue, 24 May 2005 19:41:13 +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 ACDDE43D1D
	for <perforce@freebsd.org>; Tue, 24 May 2005 19:41:13 +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 j4OJfDb2084014
	for <perforce@freebsd.org>; Tue, 24 May 2005 19:41:13 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4OJfDBt084011
	for perforce@freebsd.org; Tue, 24 May 2005 19:41:13 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 24 May 2005 19:41:13 GMT
Message-Id: <200505241941.j4OJfDBt084011@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 77405 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: Tue, 24 May 2005 19:41:15 -0000

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

Change 77405 by peter@peter_daintree on 2005/05/24 19:41:02

	integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#96 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#73 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#67 integrate

Differences ...

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


==== //depot/projects/hammer/sys/amd64/conf/GENERIC#73 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/conf/NOTES#67 (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.1198)
+# (XXX from i386:NOTES,v 1.1199)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.34 2005/04/30 20:00:58 dwhite Exp $
 #
 
@@ -105,6 +105,12 @@
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
+#
+# Add support for the ReiserFS filesystem (used in Linux). Currently,
+# this is limited to read-only access.
+#
+options 	REISERFS
+
 device		gzip		#Exec gzipped a.out's.  REQUIRES COMPAT_AOUT!