From owner-p4-projects@FreeBSD.ORG  Tue Feb  8 00:49:16 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C822916A4D0; Tue,  8 Feb 2005 00:49:15 +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 9DEE516A4CE
	for <perforce@freebsd.org>; Tue,  8 Feb 2005 00:49:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8059543D1D
	for <perforce@freebsd.org>; Tue,  8 Feb 2005 00:49:15 +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 j180nFZi074927
	for <perforce@freebsd.org>; Tue, 8 Feb 2005 00:49:15 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j180nFu6074922
	for perforce@freebsd.org; Tue, 8 Feb 2005 00:49:15 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 8 Feb 2005 00:49:15 GMT
Message-Id: <200502080049.j180nFu6074922@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 70572 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: Tue, 08 Feb 2005 00:49:16 -0000

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

Change 70572 by peter@peter_daintree on 2005/02/08 00:48:29

	integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/legacy.c#18 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#114 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#54 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#30 integrate
.. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#17 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#18 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#114 (text+ko) ====

@@ -102,8 +102,11 @@
 #endif
 #include <ddb/ddb.h>
 
+#include <isa/rtc.h>
+
 #include <net/netisr.h>
 
+#include <machine/bootinfo.h>
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>

==== //depot/projects/hammer/sys/amd64/conf/NOTES#54 (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.1178)
+# (XXX from i386:NOTES,v 1.1179)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.21 2005/02/05 21:01:09 njl Exp $
 #
 
@@ -209,6 +209,9 @@
 # Support for ACPI CPU Performance states via cpufreq(4)
 device		acpi_perf
 
+# The cpufreq(4) driver provides support for non-ACPI CPU frequency control
+device		cpufreq
+
 # DRM options:
 # mgadrm:    AGP Matrox G200, G400, G450, G550
 # r128drm:   ATI Rage 128

==== //depot/projects/hammer/sys/amd64/isa/clock.c#30 (text+ko) ====

@@ -718,6 +718,7 @@
 
 	/* Reenable RTC updates and interrupts. */
 	writertc(RTC_STATUSB, rtc_statusb);
+	rtcin(RTC_INTR);
 }
 
 
@@ -764,6 +765,7 @@
 		    INTR_TYPE_CLK | INTR_FAST, NULL);
 
 		writertc(RTC_STATUSB, rtc_statusb);
+		rtcin(RTC_INTR);
 	}
 
 	init_TSC_tc();

==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#17 (text+ko) ====