summaryrefslogtreecommitdiffstats
path: root/sys/dev/streams
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2016-04-23 20:29:55 +0000
committerdchagin <dchagin@FreeBSD.org>2016-04-23 20:29:55 +0000
commit4f918be2a10ecffb99a70b01d7793a2376292354 (patch)
tree9c696e24009edfd940071f2c82b8f3574e3f89e3 /sys/dev/streams
parent70b5d1597004b54a0bf784a23f81745ba1819934 (diff)
downloadFreeBSD-src-4f918be2a10ecffb99a70b01d7793a2376292354.zip
FreeBSD-src-4f918be2a10ecffb99a70b01d7793a2376292354.tar.gz
Fix streams and svr4 module dependency. Both modules are complaining about
undefined symbol svr4_delete_socket which was moved from streams to the svr4 module in r160558 that created a two-way dependency between them. PR: 208464 Submitted by: Kristoffer Eriksson Reported by: Kristoffer Eriksson MFC after: 2 week
Diffstat (limited to 'sys/dev/streams')
-rw-r--r--sys/dev/streams/streams.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 032d10c..2b4225f 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -169,6 +169,7 @@ static moduledata_t streams_mod = {
};
DECLARE_MODULE(streams, streams_mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
MODULE_VERSION(streams, 1);
+MODULE_DEPEND(streams, svr4elf, 1, 1, 1);
/*
* We only need open() and close() routines. open() calls socreate()
@@ -321,19 +322,6 @@ svr4_ptm_alloc(td)
}
-struct svr4_strm *
-svr4_stream_get(fp)
- struct file *fp;
-{
- struct socket *so;
-
- if (fp == NULL || fp->f_type != DTYPE_SOCKET)
- return NULL;
-
- so = fp->f_data;
- return so->so_emuldata;
-}
-
static int
svr4_soo_close(struct file *fp, struct thread *td)
{
OpenPOWER on IntegriCloud