Page MenuHomeFreeBSD

D61879.1795419374.diff
No OneTemporary

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D61879.1795419374.diff

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -76,15 +76,6 @@
.Pa /dev/hpn?
exist for compatibility with the Dell and HP versions of management tools,
respectively.
-If the
-.Pa aac_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
@@ -280,7 +271,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 HISTORY
diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c
deleted file mode 100644
--- a/sys/dev/aac/aac_linux.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-/*
- * Linux ioctl handler for the aac device driver
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/capsicum.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(aac, AAC_LINUX_IOCTL_MIN, AAC_LINUX_IOCTL_MAX);
-
-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)
-{
- cap_rights_t rights;
- struct file *fp;
- u_long cmd;
- int error;
-
- error = fget(td, args->fd, cap_rights_init_one(&rights, CAP_IOCTL),
- &fp);
- if (error != 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
--- a/sys/modules/aac/Makefile
+++ b/sys/modules/aac/Makefile
@@ -1,9 +1,5 @@
.PATH: ${SRCTOP}/sys/dev/aac
-.if ${MACHINE_CPUARCH} == "i386"
-SUBDIR= aac_linux
-.endif
-
KMOD= aac
SRCS= aac.c aac_pci.c aac_disk.c aac_cam.c
SRCS+= opt_scsi.h opt_cam.h opt_aac.h
diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc
deleted file mode 100644
--- a/sys/modules/aac/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-.include "../Makefile.inc"
diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile
deleted file mode 100644
--- a/sys/modules/aac/aac_linux/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PATH: ${SRCTOP}/sys/dev/aac
-
-KMOD= aac_linux
-SRCS= aac_linux.c
-
-.include <bsd.kmod.mk>

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 23, 7:36 AM (13 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41924092
Default Alt Text
D61879.1795419374.diff (4 KB)

Event Timeline