From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:28:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A028D16A4DD; Sun, 13 Aug 2006 13:28:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6068816A4E0 for ; Sun, 13 Aug 2006 13:28:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F3D843D45 for ; Sun, 13 Aug 2006 13:28:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDS8n8021757 for ; Sun, 13 Aug 2006 13:28:09 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDS8cD021754 for perforce@freebsd.org; Sun, 13 Aug 2006 13:28:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:28:08 GMT Message-Id: <200608131328.k7DDS8cD021754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:28:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103761 Change 103761 by rdivacky@rdivacky_witten on 2006/08/13 13:27:15 Move mq* syscalls to MD, it uses timespec. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#45 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include "opt_compat.h" -#include "opt_posix.h" #ifdef COMPAT_LINUX32 #include @@ -806,66 +805,6 @@ } } -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); MODULE_DEPEND(linux, sysvsem, 1, 1, 1); MODULE_DEPEND(linux, sysvshm, 1, 1, 1); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#45 (text+ko) ==== @@ -65,6 +65,8 @@ #include /* needed for pcb definition in linux_set_thread_area */ +#include "opt_posix.h" + extern struct sx emul_shared_lock; extern struct sx emul_lock; @@ -1129,3 +1131,65 @@ { return ktimer_delete(td, (struct ktimer_delete_args *) args); } + +/* XXX: this wont work with module - convert it */ +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 +} +