From owner-p4-projects  Sat Sep 21 12: 3:19 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE1BE37B404; Sat, 21 Sep 2002 12:03:16 -0700 (PDT)
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 98EA537B401
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 12:03:16 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 533CB43E81
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 12:03:16 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LJ3GCo034787
	for <perforce@freebsd.org>; Sat, 21 Sep 2002 12:03:16 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LJ3FJh034761
	for perforce@freebsd.org; Sat, 21 Sep 2002 12:03:15 -0700 (PDT)
Date: Sat, 21 Sep 2002 12:03:15 -0700 (PDT)
Message-Id: <200209211903.g8LJ3FJh034761@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 17870 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17870

Change 17870 by peter@peter_overcee on 2002/09/21 12:00:06

	integrate via i386_hammer branch

Affected files ...

.. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 integrate
.. //depot/projects/hammer/sys/x86_64/isa/clock.c#4 integrate

Differences ...

==== //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 (text+ko) ====


==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.128 2002/07/21 05:22:16 peter Exp $
+ * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.129 2002/09/21 18:26:53 markm Exp $
  */
 
 /*
@@ -124,6 +124,12 @@
 	return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1);
 }
 
+static __inline void
+halt(void)
+{
+	__asm __volatile("hlt");
+}
+
 #if __GNUC__ < 2
 
 #define	inb(port)		inbv(port)
@@ -600,6 +606,7 @@
 void	disable_intr(void);
 void	do_cpuid(u_int ax, u_int *p);
 void	enable_intr(void);
+void	halt(void);
 u_char	inb(u_int port);
 u_int	inl(u_int port);
 void	insb(u_int port, void *addr, size_t cnt);

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

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/i386/isa/clock.c,v 1.188 2002/09/18 07:34:04 iwasaki Exp $
+ * $FreeBSD: src/sys/i386/isa/clock.c,v 1.189 2002/09/21 07:59:06 phk Exp $
  */
 
 /*
@@ -65,8 +65,6 @@
 #include <sys/power.h>
 
 #include <machine/clock.h>
-#ifdef CLK_CALIBRATION_LOOP
-#endif
 #include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/limits.h>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message