Date: Tue, 25 Jul 2006 17:56:17 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 102396 for review Message-ID: <200607251756.k6PHuHv4085292@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102396 Change 102396 by rdivacky@rdivacky_witten on 2006/07/25 17:56:12 Make the module loadable if you dont have P1003_1B_MQUEUE in kernel config. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#6 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#4 (text+ko) ==== @@ -40,6 +40,7 @@ #include <sys/shm.h> #include "opt_compat.h" +#include "opt_posix.h" #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> @@ -808,37 +809,61 @@ int linux_mq_open(struct thread *td, struct linux_mq_open_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_open(td, (struct kmq_open_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_unlink(struct thread *td, struct linux_mq_unlink_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_unlink(td, (struct kmq_unlink_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_timedsend(struct thread *td, struct linux_mq_timedsend_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_timedsend(td, (struct kmq_timedsend_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_timedreceive(struct thread *td, struct linux_mq_timedreceive_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_timedreceive(td, (struct kmq_timedreceive_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_notify(struct thread *td, struct linux_mq_notify_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_notify(td, (struct kmq_notify_args *) args); +#else + return (ENOSYS); +#endif } int linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) { +#ifdef P1003_1B_MQUEUE return kmq_setattr(td, (struct kmq_setattr_args *) args); +#else + return (ENOSYS); +#endif } MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#6 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= linux${SFX}_dummy.c linux_file.c linux_futex.c linux_getcwd.c linux_ioctl.c \ linux_ipc.c linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c linux${SFX}_sysvec.c \ - linux_uid16.c linux_util.c linux_time.c opt_inet6.h opt_mac.h opt_compat.h \ + linux_uid16.c linux_util.c linux_time.c opt_inet6.h opt_mac.h opt_compat.h opt_posix.h \ vnode_if.h device_if.h bus_if.h OBJS= linux${SFX}_locore.o
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607251756.k6PHuHv4085292>