From: mlarkin <mlarkin@openbsd.org>
Date: Thu, 29 Jun 2017 07:11:24 +0000 (+0000)
Subject: Remove an "#if 1" that had been in the code for 16 years. I think it's
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fde4294eec1ec8c11aa9eba07e5f6972aca96e9b;p=openbsd

Remove an "#if 1" that had been in the code for 16 years. I think it's
safe to say it's been enabled long enough to warrant permanent inclusion.
---

diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 2cf28746d3a..78abb6f6215 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.602 2017/05/30 15:11:32 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.603 2017/06/29 07:11:24 mlarkin Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -3420,14 +3420,12 @@ cpu_reset(void)
 	lidt(&region);
 	__asm volatile("divl %0,%1" : : "q" (0), "a" (0));
 
-#if 1
 	/*
 	 * Try to cause a triple fault and watchdog reset by unmapping the
 	 * entire address space.
 	 */
 	bzero((caddr_t)PTD, NBPG);
 	tlbflush();
-#endif
 
 	for (;;)
 		continue;