[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 258c792620c5c236226807cb084775ff39f94f30 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=258c792620c5c236226807cb084775ff39f94f30 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |1 + 1 file changed, 1 insertion(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index fa2dae4..96ca5f1 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,7 @@ * symbol, so that obsolete wrappers can be spotted. */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #define in_ia32_syscall() (current_thread_info()->status & TS_COMPAT) #endif ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 924bd3741fdbfb9cc0574053978ef483ba375b69 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=924bd3741fdbfb9cc0574053978ef483ba375b69 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index c9e6e87..7b191e4 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,10 +38,17 @@ * symbol, so that obsolete wrappers can be spotted. */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #define in_ia32_syscall() (current_thread_info()->status & TS_COMPAT) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -137,10 +144,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 33037b1e4c4d3d4e679d10fc8d5be062681b6cf8 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=33037b1e4c4d3d4e679d10fc8d5be062681b6cf8 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 0f9ab14..8ad4108 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,12 @@ * symbol, so that obsolete wrappers can be spotted. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -133,10 +139,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 3e71b17ed785d2c276a31a0767cd0a0fd190110f URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=3e71b17ed785d2c276a31a0767cd0a0fd190110f Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 0f9ab14..8ad4108 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,12 @@ * symbol, so that obsolete wrappers can be spotted. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -133,10 +139,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 4430c60c66f4b911c18a79bbcb8fa152e882acd2 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=4430c60c66f4b911c18a79bbcb8fa152e882acd2 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 0f9ab14..8ad4108 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,12 @@ * symbol, so that obsolete wrappers can be spotted. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -133,10 +139,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: e6faa9b7276b8d361c77fa397e9348ee46486f56 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=e6faa9b7276b8d361c77fa397e9348ee46486f56 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 0f9ab14..8ad4108 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,12 @@ * symbol, so that obsolete wrappers can be spotted. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -133,10 +139,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 2f9eb745bc786242bbb0529997dfd908b246a407 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=2f9eb745bc786242bbb0529997dfd908b246a407 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 0f9ab14..8ad4108 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -38,6 +38,12 @@ * symbol, so that obsolete wrappers can be spotted. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) +#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) +#else +#define cobalt_get_restart_block(p)(&(p)->restart_block) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) #define user_msghdr msghdr #endif @@ -133,10 +139,4 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) -#define cobalt_get_restart_block(p)(_thread_info(p)->restart_block) -#else -#define cobalt_get_restart_block(p)(&(p)->restart_block) -#endif - #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 22ba669a110ee7089df55ab7de923afb6f79ed0f URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=22ba669a110ee7089df55ab7de923afb6f79ed0f Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 060ce85..11367ff 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -133,4 +133,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: bd2c5c80a298491967ec4bbefab0033d78315f78 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=bd2c5c80a298491967ec4bbefab0033d78315f78 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 060ce85..11367ff 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -133,4 +133,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 6c685c816fde8d8c3a59706e9bfa3f316e263112 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=6c685c816fde8d8c3a59706e9bfa3f316e263112 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 060ce85..11367ff 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -133,4 +133,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 9da34fe8bdb8a469e4a6a8414862d59a11615f25 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=9da34fe8bdb8a469e4a6a8414862d59a11615f25 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 060ce85..11367ff 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -133,4 +133,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: 0a281e59efd0219d0d3ca41f1162292fc13055f4 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=0a281e59efd0219d0d3ca41f1162292fc13055f4 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index 060ce85..11367ff 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -133,4 +133,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, #error "Xenomai/cobalt requires Linux kernel 3.10 or above" #endif /* < 3.10 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org https://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: stable-3.0.x Commit: 5a9d7c638798a328e8d0634ab9bcd455bf492c10 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5a9d7c638798a328e8d0634ab9bcd455bf492c10 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 1 file changed, 4 insertions(+) diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h index f43b8fb..f889a7d 100644 --- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h +++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h @@ -130,4 +130,8 @@ trace_seq_buffer_ptr(struct trace_seq *s) #define user_msghdr msghdr #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) +#define user_msghdr msghdr +#endif + #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ ___ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: a85a4116edb8d7631cea2b472dd5ce45297ef1af URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=a85a4116edb8d7631cea2b472dd5ce45297ef1af Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- include/cobalt/kernel/compat.h |5 +++-- include/cobalt/kernel/rtdm/fd.h | 16 include/cobalt/kernel/rtdm/rtdm.h|8 kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 kernel/cobalt/posix/compat.c |4 ++-- kernel/cobalt/posix/io.c |8 kernel/cobalt/posix/io.h |4 ++-- kernel/cobalt/posix/syscall32.c |4 ++-- kernel/cobalt/rtdm/core.c|8 kernel/cobalt/rtdm/fd.c |4 ++-- kernel/drivers/can/rtcan_raw.c |4 ++-- kernel/drivers/ipc/bufp.c|4 ++-- kernel/drivers/ipc/iddp.c|4 ++-- kernel/drivers/ipc/internal.h|8 kernel/drivers/ipc/rtipc.c |8 kernel/drivers/ipc/xddp.c|4 ++-- kernel/drivers/net/stack/ipv4/tcp/tcp.c |4 ++-- kernel/drivers/net/stack/ipv4/udp/udp.c |4 ++-- kernel/drivers/net/stack/packet/af_packet.c |4 ++-- 19 files changed, 57 insertions(+), 52 deletions(-) diff --git a/include/cobalt/kernel/compat.h b/include/cobalt/kernel/compat.h index b0ef81e..43378d9 100644 --- a/include/cobalt/kernel/compat.h +++ b/include/cobalt/kernel/compat.h @@ -22,6 +22,7 @@ #include #include +#include #include struct mq_attr; @@ -135,11 +136,11 @@ int sys32_get_sigval(union sigval *val, const union compat_sigval *u_cval); int sys32_put_siginfo(void __user *u_si, const struct siginfo *si, int overrun); -int sys32_get_msghdr(struct msghdr *msg, +int sys32_get_msghdr(struct user_msghdr *msg, const struct compat_msghdr __user *u_cmsg); int sys32_put_msghdr(struct compat_msghdr __user *u_cmsg, -const struct msghdr *msg); +const struct user_msghdr *msg); int sys32_get_iovec(struct iovec *iov, const struct compat_iovec __user *ciov, diff --git a/include/cobalt/kernel/rtdm/fd.h b/include/cobalt/kernel/rtdm/fd.h index 1c0fe9e..dc653d6 100644 --- a/include/cobalt/kernel/rtdm/fd.h +++ b/include/cobalt/kernel/rtdm/fd.h @@ -143,7 +143,7 @@ ssize_t rtdm_write_handler(struct rtdm_fd *fd, const void __user *buf, size_t si * @see @c recvmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); +ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct user_msghdr *msg, int flags); /** * Transmit message handler @@ -160,7 +160,7 @@ ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); * @see @c sendmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct msghdr *msg, int flags); +ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct user_msghdr *msg, int flags); /** * Select handler @@ -267,16 +267,16 @@ struct rtdm_fd_ops { const void __user *buf, size_t size); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_rt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_nrt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_rt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_nrt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_select_handler(). */ int (*select)(struct rtdm_fd *fd, struct xnselector *selector, @@ -363,9 +363,9 @@ ssize_t rtdm_fd_write(int ufd, const void __user *buf, size_t size); int rtdm_fd_close(int ufd, unsigned int magic); -ssize_t rtdm_fd_recvmsg(int ufd, struct msghdr *msg, int flags); +ssize_t rtdm_fd_recvmsg(int ufd, struct user_msghdr *msg, int flags); -ssize_t
[Xenomai-git] Philippe Gerum : cobalt/kernel: fixup for v3.19+ (user_msghdr)
Module: xenomai-3 Branch: next Commit: b18b17b80ffa3718c4e2129fd439b52fab3becb3 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=b18b17b80ffa3718c4e2129fd439b52fab3becb3 Author: Philippe GerumDate: Mon Nov 2 20:45:10 2015 +0100 cobalt/kernel: fixup for v3.19+ (user_msghdr) --- include/cobalt/kernel/compat.h |4 ++-- include/cobalt/kernel/rtdm/fd.h | 16 include/cobalt/kernel/rtdm/rtdm.h|8 kernel/cobalt/include/asm-generic/xenomai/wrappers.h |4 kernel/cobalt/posix/compat.c |4 ++-- kernel/cobalt/posix/io.c |8 kernel/cobalt/posix/io.h |4 ++-- kernel/cobalt/posix/syscall32.c |4 ++-- kernel/cobalt/rtdm/core.c|8 kernel/cobalt/rtdm/fd.c |4 ++-- kernel/drivers/can/rtcan_raw.c |4 ++-- kernel/drivers/ipc/bufp.c|4 ++-- kernel/drivers/ipc/iddp.c|4 ++-- kernel/drivers/ipc/internal.h|8 kernel/drivers/ipc/rtipc.c |8 kernel/drivers/ipc/xddp.c|4 ++-- kernel/drivers/net/stack/ipv4/tcp/tcp.c |4 ++-- kernel/drivers/net/stack/ipv4/udp/udp.c |4 ++-- kernel/drivers/net/stack/packet/af_packet.c |4 ++-- 19 files changed, 56 insertions(+), 52 deletions(-) diff --git a/include/cobalt/kernel/compat.h b/include/cobalt/kernel/compat.h index b0ef81e..6683438 100644 --- a/include/cobalt/kernel/compat.h +++ b/include/cobalt/kernel/compat.h @@ -135,11 +135,11 @@ int sys32_get_sigval(union sigval *val, const union compat_sigval *u_cval); int sys32_put_siginfo(void __user *u_si, const struct siginfo *si, int overrun); -int sys32_get_msghdr(struct msghdr *msg, +int sys32_get_msghdr(struct user_msghdr *msg, const struct compat_msghdr __user *u_cmsg); int sys32_put_msghdr(struct compat_msghdr __user *u_cmsg, -const struct msghdr *msg); +const struct user_msghdr *msg); int sys32_get_iovec(struct iovec *iov, const struct compat_iovec __user *ciov, diff --git a/include/cobalt/kernel/rtdm/fd.h b/include/cobalt/kernel/rtdm/fd.h index 1c0fe9e..dc653d6 100644 --- a/include/cobalt/kernel/rtdm/fd.h +++ b/include/cobalt/kernel/rtdm/fd.h @@ -143,7 +143,7 @@ ssize_t rtdm_write_handler(struct rtdm_fd *fd, const void __user *buf, size_t si * @see @c recvmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); +ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct user_msghdr *msg, int flags); /** * Transmit message handler @@ -160,7 +160,7 @@ ssize_t rtdm_recvmsg_handler(struct rtdm_fd *fd, struct msghdr *msg, int flags); * @see @c sendmsg() in IEEE Std 1003.1, * http://www.opengroup.org/onlinepubs/009695399 */ -ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct msghdr *msg, int flags); +ssize_t rtdm_sendmsg_handler(struct rtdm_fd *fd, const struct user_msghdr *msg, int flags); /** * Select handler @@ -267,16 +267,16 @@ struct rtdm_fd_ops { const void __user *buf, size_t size); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_rt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_recvmsg_handler(). */ ssize_t (*recvmsg_nrt)(struct rtdm_fd *fd, - struct msghdr *msg, int flags); + struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_rt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_sendmsg_handler(). */ ssize_t (*sendmsg_nrt)(struct rtdm_fd *fd, - const struct msghdr *msg, int flags); + const struct user_msghdr *msg, int flags); /** See rtdm_select_handler(). */ int (*select)(struct rtdm_fd *fd, struct xnselector *selector, @@ -363,9 +363,9 @@ ssize_t rtdm_fd_write(int ufd, const void __user *buf, size_t size); int rtdm_fd_close(int ufd, unsigned int magic); -ssize_t rtdm_fd_recvmsg(int ufd, struct msghdr *msg, int flags); +ssize_t rtdm_fd_recvmsg(int ufd, struct user_msghdr *msg, int flags); -ssize_t rtdm_fd_sendmsg(int ufd, const struct msghdr *msg, +ssize_t rtdm_fd_sendmsg(int ufd,