From: Sascha Wildner <saw@online.de>
Date: Sun, 13 Jan 2019 00:07:03 +0000 (+0100)
Subject: i386 removal, part 70/x: Remove some i386 specific bits in the kernel.
X-Git-Tag: v5.7.0~611
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/483114b6109f002ec2d557cc808540ef18b5b11c

i386 removal, part 70/x: Remove some i386 specific bits in the kernel.
---

diff --git a/sys/dev/crypto/aesni/aesni.h b/sys/dev/crypto/aesni/aesni.h
index 7aa5af2b45..6219280038 100644
--- a/sys/dev/crypto/aesni/aesni.h
+++ b/sys/dev/crypto/aesni/aesni.h
@@ -35,15 +35,11 @@
 
 #include <opencrypto/cryptodev.h>
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__)
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#endif
-#if defined(__i386__)
-#include <machine/npx.h>
-#elif defined(__x86_64__)
 #include <machine/npx.h>
 #endif
 
diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c
index 72956a7d12..e7645ed405 100644
--- a/sys/dev/misc/syscons/syscons.c
+++ b/sys/dev/misc/syscons/syscons.c
@@ -1371,18 +1371,14 @@ scioctl(struct dev_ioctl_args *ap)
 	    lwkt_reltoken(&vga_token);
 	    return EPERM;
 	}
-#if defined(__i386__)
-	curthread->td_lwp->lwp_md.md_regs->tf_eflags |= PSL_IOPL;
-#elif defined(__x86_64__)
+#if defined(__x86_64__)
 	curthread->td_lwp->lwp_md.md_regs->tf_rflags |= PSL_IOPL;
 #endif
 	lwkt_reltoken(&vga_token);
 	return 0;
 
     case KDDISABIO:     	/* disallow io operations (default) */
-#if defined(__i386__)
-	curthread->td_lwp->lwp_md.md_regs->tf_eflags &= ~PSL_IOPL;
-#elif defined(__x86_64__)
+#if defined(__x86_64__)
 	curthread->td_lwp->lwp_md.md_regs->tf_rflags &= ~PSL_IOPL;
 #endif
         lwkt_reltoken(&vga_token);