Only in src/sys/amd64/amd64: db_trace.c.orig
Only in src/sys/amd64/amd64: exception.S.orig
diff -ur src.old/sys/amd64/amd64/machdep.c src/sys/amd64/amd64/machdep.c
--- src.old/sys/amd64/amd64/machdep.c	Sat Apr 29 18:55:51 2006
+++ src/sys/amd64/amd64/machdep.c	Sun Apr 30 14:27:57 2006
@@ -1198,7 +1198,7 @@
 		setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0);
 	setidt(IDT_DE, &IDTVEC(div),  SDT_SYSIGT, SEL_KPL, 0);
 	setidt(IDT_DB, &IDTVEC(dbg),  SDT_SYSIGT, SEL_KPL, 0);
-	setidt(IDT_NMI, &IDTVEC(nmi),  SDT_SYSIGT, SEL_KPL, 0);
+	setidt(IDT_NMI, &IDTVEC(nmi),  SDT_SYSIGT, SEL_KPL, 1);
  	setidt(IDT_BP, &IDTVEC(bpt),  SDT_SYSIGT, SEL_UPL, 0);
 	setidt(IDT_OF, &IDTVEC(ofl),  SDT_SYSIGT, SEL_KPL, 0);
 	setidt(IDT_BR, &IDTVEC(bnd),  SDT_SYSIGT, SEL_KPL, 0);
Only in src/sys/amd64/amd64: machdep.c.orig
Only in src/sys/amd64/amd64: trap.c.orig
Only in src/sys/amd64/include: atomic.h.orig