Module: xenomai-jki
Branch: for-forge
Commit: 2f92ae97d8ca8da624ae0848a86628690907147c
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=2f92ae97d8ca8da624ae0848a86628690907147c
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Fri Mar 17 18:09:26 2017 +0100
drivers/ipc: Fix non-compat build
Reported and suggested by Simon Sudler.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
kernel/drivers/ipc/rtipc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/drivers/ipc/rtipc.c b/kernel/drivers/ipc/rtipc.c
index 46b253a..fa1c0b4 100644
--- a/kernel/drivers/ipc/rtipc.c
+++ b/kernel/drivers/ipc/rtipc.c
@@ -108,12 +108,14 @@ int rtipc_put_iovec(struct rtdm_fd *fd, struct iovec *iov,
if (!rtdm_fd_is_user(fd)) {
memcpy(msg->msg_iov, iov, len);
ret = 0;
- } else if (IS_ENABLED(CONFIG_XENO_ARCH_SYS3264) &&
- rtdm_fd_is_compat(fd))
+#ifdef CONFIG_XENO_ARCH_SYS3264
+ } else if (rtdm_fd_is_compat(fd)) {
ret = sys32_put_iovec((struct compat_iovec __user
*)msg->msg_iov,
iov, msg->msg_iovlen);
- else
+#endif
+ } else {
ret = rtdm_copy_to_user(fd, msg->msg_iov, iov, len);
+ }
if (iov != iov_fast)
xnfree(iov);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
