From 95b4dba2abfa5f533240684b7ac15c48bf1ebfe6 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 1 Mar 2017 13:53:16 +0100
Subject: [PATCH] kernel: Remove unused DIRECTIO option (see
 12b70cea73eef6a67).

---
 sys/conf/options                         |  1 -
 sys/config/LINT64                        | 11 +----------
 sys/platform/pc64/x86_64/machdep.c       |  1 -
 sys/platform/vkernel64/x86_64/cpu_regs.c |  1 -
 sys/vfs/ufs/ufs_readwrite.c              |  2 --
 5 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/sys/conf/options b/sys/conf/options
index aa3a850724..6ce9b4ed91 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -78,7 +78,6 @@ MSGTQL		opt_sysvipc.h
 UCONSOLE
 ICMP_BANDLIM
 SHOW_BUSYBUFS
-DIRECTIO	opt_directio.h
 
 # POSIX kernel options
 _KPOSIX_PRIORITY_SCHEDULING	opt_posix.h
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 2e57d400c5..8a46c79ee8 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -1826,16 +1826,7 @@ options		DEBUG_LOCKS_LATENCY
 # console.
 options 	PANIC_REBOOT_WAIT_TIME=16
 
-# Attempt to bypass the buffer cache and put data directly into the
-# userland buffer for read operation when O_DIRECT flag is set on the
-# file.  Both offset and length of the read operation must be
-# multiples of the physical media sector size.
-#
-options		DIRECTIO
-
-# Specify a lower limit for the number of swap I/O buffers.  They are
-# (among other things) used when bypassing the buffer cache due to
-# DIRECTIO kernel option enabled and O_DIRECT flag set on file.
+# Specify a lower limit for the number of swap I/O buffers.
 #
 #options		NSWBUF_MIN=120
 
diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c
index f04edd5978..2b810fa76f 100644
--- a/sys/platform/pc64/x86_64/machdep.c
+++ b/sys/platform/pc64/x86_64/machdep.c
@@ -44,7 +44,6 @@
 #include "use_isa.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
-#include "opt_directio.h"
 #include "opt_inet.h"
 #include "opt_msgbuf.h"
 #include "opt_swap.h"
diff --git a/sys/platform/vkernel64/x86_64/cpu_regs.c b/sys/platform/vkernel64/x86_64/cpu_regs.c
index 4ef3a5c240..235e1ef404 100644
--- a/sys/platform/vkernel64/x86_64/cpu_regs.c
+++ b/sys/platform/vkernel64/x86_64/cpu_regs.c
@@ -40,7 +40,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_directio.h"
 #include "opt_inet.h"
 #include "opt_msgbuf.h"
 #include "opt_swap.h"
diff --git a/sys/vfs/ufs/ufs_readwrite.c b/sys/vfs/ufs/ufs_readwrite.c
index c9e7699d8f..b67e06cbc3 100644
--- a/sys/vfs/ufs/ufs_readwrite.c
+++ b/sys/vfs/ufs/ufs_readwrite.c
@@ -44,8 +44,6 @@
 #include <sys/sysctl.h>
 #include <vm/vm_page2.h>
 
-#include "opt_directio.h"
-
 #define VN_KNOTE(vp, b) KNOTE(&vp->v_pollinfo.vpi_kqinfo.ki_note, (b))
 
 SYSCTL_DECL(_vfs_ffs);
-- 
2.11.4.GIT