From owner-p4-projects@FreeBSD.ORG  Tue Mar 21 22:19:14 2006
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 0B50E16A42F; Tue, 21 Mar 2006 22:19:14 +0000 (UTC)
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 C7F8916A400
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 22:19:13 +0000 (UTC)
	(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 5BB5343D62
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 22:19: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 k2LMJDA8090298
	for <perforce@freebsd.org>; Tue, 21 Mar 2006 22:19:13 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LMJDfO090295
	for perforce@freebsd.org; Tue, 21 Mar 2006 22:19:13 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 21 Mar 2006 22:19:13 GMT
Message-Id: <200603212219.k2LMJDfO090295@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 93758 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, 21 Mar 2006 22:19:14 -0000

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

Change 93758 by peter@peter_melody on 2006/03/21 22:18:42

	integrate i386_hammer branch.  Mostly a NOP, except for a cosmetic
	convergence sync in machdep.c for debug regs.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#50 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#68 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#154 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#50 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#68 (text+ko) ====


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

@@ -1766,17 +1766,20 @@
 			if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS)
 				return (EINVAL);
 		}
-		if (dbregs->dr[7] & 0x3<<2) {
+
+		if (dbregs->dr[7] & (0x3<<2)) {
 			/* dr1 is enabled */
 			if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS)
 				return (EINVAL);
 		}
-		if (dbregs->dr[7] & 0x3<<4) {
+			
+		if (dbregs->dr[7] & (0x3<<4)) {
 			/* dr2 is enabled */
 			if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS)
 				return (EINVAL);
 		}
-		if (dbregs->dr[7] & 0x3<<6) {
+			
+		if (dbregs->dr[7] & (0x3<<6)) {
 			/* dr3 is enabled */
 			if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS)
 				return (EINVAL);