i386 removal, part 70/x: Remove some i386 specific bits in the kernel.
authorSascha Wildner <saw@online.de>
Sun, 13 Jan 2019 00:07:03 +0000 (01:07 +0100)
committerSascha Wildner <saw@online.de>
Sun, 13 Jan 2019 00:07:03 +0000 (01:07 +0100)
sys/dev/crypto/aesni/aesni.h
sys/dev/misc/syscons/syscons.c

index 7aa5af2..6219280 100644 (file)
 
 #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
 
index 72956a7..e7645ed 100644 (file)
@@ -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);