Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177846716
D61880.1795419417.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None
D61880.1795419417.diff
View Options
diff --git a/share/man/man4/aacraid.4 b/share/man/man4/aacraid.4
--- a/share/man/man4/aacraid.4
+++ b/share/man/man4/aacraid.4
@@ -71,15 +71,6 @@
.Pa /dev/aacraid?
device nodes provide access to the management interface of the controller.
One node exists per installed card.
-If the
-.Pa aacraid_linux.ko
-and
-.Pa linux.ko
-modules are loaded, the
-Linux-compatible
-.Xr ioctl 2
-interface for the management device will be enabled and will allow
-Linux-based management applications to control the card.
.Sh HARDWARE
The
.Nm
@@ -125,7 +116,6 @@
and are also queued for retrieval by a management application.
.Sh SEE ALSO
.Xr kld 4 ,
-.Xr linux 4 ,
.Xr scsi 4 ,
.Xr kldload 8
.Sh AUTHORS
diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c
deleted file mode 100644
--- a/sys/dev/aacraid/aacraid_linux.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2002 Scott Long
- * Copyright (c) 2002-2010 Adaptec, Inc.
- * Copyright (c) 2010-2012 PMC-Sierra, Inc.
- * 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.
- */
-
-#include <sys/cdefs.h>
-/*
- * Linux ioctl handler for the aac device driver
- */
-
-#include <sys/param.h>
-#include <sys/capsicum.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/file.h>
-#include <sys/proc.h>
-#ifdef __amd64__
-#include <machine/../linux32/linux.h>
-#include <machine/../linux32/linux32_proto.h>
-#else
-#include <machine/../linux/linux.h>
-#include <machine/../linux/linux_proto.h>
-#endif
-#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
-
-LINUX_IOCTL_SET(aacraid, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX);
-
-static int
-aacraid_linux_modevent(module_t mod, int type, void *data)
-{
- /* Do we care about any specific load/unload actions? */
- return (0);
-}
-
-DEV_MODULE(aacraid_linux, aacraid_linux_modevent, NULL);
-MODULE_DEPEND(aacraid_linux, linux, 1, 1, 1);
-
-static int
-aacraid_linux_ioctl(struct thread *td, struct linux_ioctl_args *args)
-{
- struct file *fp;
- cap_rights_t rights;
- u_long cmd;
- int error;
-
- if ((error = fget(td, args->fd,
- cap_rights_init_one(&rights, CAP_IOCTL),
- &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/aacraid/Makefile b/sys/modules/aacraid/Makefile
--- a/sys/modules/aacraid/Makefile
+++ b/sys/modules/aacraid/Makefile
@@ -1,9 +1,5 @@
.PATH: ${SRCTOP}/sys/dev/aacraid
-.if ${MACHINE_CPUARCH} == "i386"
-SUBDIR= aacraid_linux
-.endif
-
KMOD= aacraid
SRCS= aacraid.c aacraid_pci.c aacraid_cam.c
.if ${MACHINE_CPUARCH} == "powerpc"
diff --git a/sys/modules/aacraid/Makefile.inc b/sys/modules/aacraid/Makefile.inc
deleted file mode 100644
--- a/sys/modules/aacraid/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-.include "../Makefile.inc"
diff --git a/sys/modules/aacraid/aacraid_linux/Makefile b/sys/modules/aacraid/aacraid_linux/Makefile
deleted file mode 100644
--- a/sys/modules/aacraid/aacraid_linux/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PATH: ${SRCTOP}/sys/dev/aacraid
-
-KMOD= aacraid_linux
-SRCS= aacraid_linux.c
-
-.include <bsd.kmod.mk>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 7:36 AM (13 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41925605
Default Alt Text
D61880.1795419417.diff (4 KB)
Attached To
Mode
D61880: aacraid_linux: Remove Linux ioctl support for the aacraid(4) driver
Attached
Detach File
Event Timeline