From owner-p4-projects@FreeBSD.ORG  Tue Jul 25 17:57:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F64C16A4DA; Tue, 25 Jul 2006 17:57:44 +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 C587916A50A
	for <perforce@FreeBSD.org>; Tue, 25 Jul 2006 17:57:43 +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 6B6B243DA3
	for <perforce@FreeBSD.org>; Tue, 25 Jul 2006 17:56:21 +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 k6PHuHrg085295
	for <perforce@FreeBSD.org>; Tue, 25 Jul 2006 17:56:17 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PHuHv4085292
	for perforce@freebsd.org; Tue, 25 Jul 2006 17:56:17 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 25 Jul 2006 17:56:17 GMT
Message-Id: <200607251756.k6PHuHv4085292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 102396 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jul 2006 17:57:44 -0000

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