PERFORCE change 93758 for review

[Peter Wemm]

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

Change 93758 by peter at 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);