summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2017-06-29 07:19:41 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2017-06-29 07:19:41 +0000
commitf7ec02b81898eec5fead73cd6fa5194e89fa4434 (patch)
tree706e748d8e9b81f16e064dfb042ad8ac73320921
parentfa24a03e59df45b6a754880a253fc9f083e61298 (diff)
Remove a block of "#if 0" code that has been in the file since r1.1, 13
years ago. This was part of the original reset code port from i386, and we've never been able to reset amd64 in the way the code tries to do in the #if 0 block since we don't have a 'PTD' variable in amd64. I thought to keep this around for diffability with i386, but that's pretty pointless now as the diff between the two machdep.c files is over 5000 lines already...
-rw-r--r--sys/arch/amd64/amd64/machdep.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index b19edb0dcd2..9653de19924 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.229 2017/05/18 09:20:06 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.230 2017/06/29 07:19:40 mlarkin Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@@ -1632,15 +1632,6 @@ cpu_reset(void)
memset((caddr_t)idt, 0, NIDT * sizeof(idt[0]));
__asm volatile("divl %0,%1" : : "q" (0), "a" (0));
-#if 0
- /*
- * Try to cause a triple fault and watchdog reset by unmapping the
- * entire address space and doing a TLB flush.
- */
- memset((caddr_t)PTD, 0, PAGE_SIZE);
- tlbflush();
-#endif
-
for (;;)
continue;
/* NOTREACHED */