6 files changed, 96 insertions, 55 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 6bf62c45d4d3d..4b3941d0a59a4 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -223,6 +223,7 @@ dev/aac/aac_debug.c	optional aac
 dev/aac/aac_disk.c	optional aac
 dev/aac/aac_pci.c	optional aac pci
 dev/aac/aac_cam.c	optional aacp aac
+dev/aac/aac_linux.c		optional aac_compat_linux compat_linux
 dev/acpica/acpi.c		optional acpica
 dev/acpica/acpica_support.c	optional acpica
 dev/acpica/acpi_acad.c		optional acpica nowerror
diff --git a/sys/conf/options b/sys/conf/options
index 681b7f37de64f..9c715eae27153 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -31,7 +31,7 @@
 # opt_<name-of-option-in-lower-case>.h
 
 # Adaptec Array Controller driver options
-AAC_COMPAT_LINUX	opt_aac.h	# Enable the linux ioctl interface
+AAC_COMPAT_LINUX	opt_dontuse.h	# Enable the linux ioctl interface
 
 AAC_DEBUG		opt_aac.h	# Debugging levels:
 					# 0 - quiet, only emit warnings
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 218ce441be7f0..0ad1d83d44b05 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -57,7 +57,6 @@
 #include <sys/conf.h>
 #include <sys/devicestat.h>
 #include <sys/disk.h>
-#include <sys/file.h>
 #include <sys/signalvar.h>
 #include <sys/time.h>
 #include <sys/eventhandler.h>
@@ -2493,57 +2492,6 @@ aac_handle_aif(struct aac_softc *sc, struct aac_fib *fib)
 }
 
 /*
- * Linux Management Interface
- * This is soon to be removed!
- */
-
-#ifdef AAC_COMPAT_LINUX
-
-#include <sys/proc.h>
-#include <machine/../linux/linux.h>
-#include <machine/../linux/linux_proto.h>
-#include <compat/linux/linux_ioctl.h>
-
-/* There are multiple ioctl number ranges that need to be handled */
-#define AAC_LINUX_IOCTL_MIN  0x0000
-#define AAC_LINUX_IOCTL_MAX  0x21ff
-
-static linux_ioctl_function_t aac_linux_ioctl;
-static struct linux_ioctl_handler aac_handler = {aac_linux_ioctl,
-						 AAC_LINUX_IOCTL_MIN,
-						 AAC_LINUX_IOCTL_MAX};
-
-SYSINIT  (aac_register,   SI_SUB_KLD, SI_ORDER_MIDDLE,
-	  linux_ioctl_register_handler, &aac_handler);
-SYSUNINIT(aac_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE,
-	  linux_ioctl_unregister_handler, &aac_handler);
-
-MODULE_DEPEND(aac, linux, 1, 1, 1);
-
-static int
-aac_linux_ioctl(struct thread *td, struct linux_ioctl_args *args)
-{
-	struct file *fp;
-	u_long cmd;
-	int error;
-
-	debug_called(2);
-
-	if ((error = fget(td, args->fd, &fp)) != 0)
-		return (error);
-	cmd = args->cmd;
-
-	/*
-	 * Pass the ioctl off to our standard handler.
-	 */
-	error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td));
-	fdrop(fp, td);
-	return (error);
-}
-
-#endif
-
-/*
  * Return the Revision of the driver to userspace and check to see if the
  * userspace app is possibly compatible.  This is extremely bogus since
  * our driver doesn't follow Adaptec's versioning system.  Cheat by just
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
new file mode 100644
index 0000000000000..2ca8fa349caf7
--- /dev/null
+++ b/sys/dev/aac/aac_linux.c
@@ -0,0 +1,84 @@
+/*-
+ * Copyright (c) 2002 Scott Long
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	$FreeBSD$
+ */
+
+/*
+ * Linux ioctl handler for the aac device driver
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <machine/../linux/linux.h>
+#include <machine/../linux/linux_proto.h>
+#include <compat/linux/linux_ioctl.h>
+
+/* There are multiple ioctl number ranges that need to be handled */
+#define AAC_LINUX_IOCTL_MIN  0x0000
+#define AAC_LINUX_IOCTL_MAX  0x21ff
+
+static linux_ioctl_function_t aac_linux_ioctl;
+static struct linux_ioctl_handler aac_linux_handler = {aac_linux_ioctl,
+						       AAC_LINUX_IOCTL_MIN,
+						       AAC_LINUX_IOCTL_MAX};
+
+SYSINIT  (aac_linux_register,   SI_SUB_KLD, SI_ORDER_MIDDLE,
+	  linux_ioctl_register_handler, &aac_linux_handler);
+SYSUNINIT(aac_linux_unregister, SI_SUB_KLD, SI_ORDER_MIDDLE,
+	  linux_ioctl_unregister_handler, &aac_linux_handler);
+
+static int
+aac_linux_modevent(module_t mod, int type, void *data)
+{
+	/* Do we care about any specific load/unload actions? */
+	return (0);
+}
+
+DEV_MODULE(aac_linux, aac_linux_modevent, NULL);
+MODULE_DEPEND(aac_linux, linux, 1, 1, 1);
+
+static int
+aac_linux_ioctl(struct thread *td, struct linux_ioctl_args *args)
+{
+	struct file *fp;
+	u_long cmd;
+	int error;
+
+	if ((error = fget(td, args->fd, &fp)) != 0)
+		return (error);
+	cmd = args->cmd;
+
+	/*
+	 * Pass the ioctl off to our standard handler.
+	 */
+	error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td));
+	fdrop(fp, td);
+	return (error);
+}
diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile
index 7e1a351619615..f4f01752697e7 100644
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -2,13 +2,13 @@
 
 .PATH: ${.CURDIR}/../../dev/aac
 
+SUBDIR= aac_linux
+
 KMOD=	aac
 SRCS=	aac.c aac_pci.c aac_disk.c aac_cam.c
 SRCS+=	opt_scsi.h opt_cam.h opt_aac.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 
-CFLAGS+= -DAAC_COMPAT_LINUX
-
 # To enable debug output from the driver, uncomment these two lines.
 #CFLAGS+= -DAAC_DEBUG=2
 #SRCS+=	aac_debug.c
diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile
new file mode 100644
index 0000000000000..4247a2280878c
--- /dev/null
+++ b/sys/modules/aac/aac_linux/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/aac
+
+KMOD=	aac_linux
+SRCS=	aac_linux.c
+
+.include <bsd.kmod.mk>