Hi, I have 4.19 working with RTAI, LinuxCNC needs this patch however to solve build errors and warnings:
From 2765d6190515df6332d2a40326bf65177fb16794 Mon Sep 17 00:00:00 2001 From: Alec Ari <[email protected]> Date: Fri, 10 Apr 2020 00:29:43 -0500 Subject: Updates for kernel 4.19 support Signed-off-by: Alec Ari <[email protected]> --- src/emc/kinematics/pumakins.c | 1 + src/emc/kinematics/scarakins.c | 1 + src/rtapi/rtai_rtapi.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/emc/kinematics/pumakins.c b/src/emc/kinematics/pumakins.c index b9f73cb41..3b4494302 100644 --- a/src/emc/kinematics/pumakins.c +++ b/src/emc/kinematics/pumakins.c @@ -348,6 +348,7 @@ KINEMATICS_TYPE kinematicsType() EXPORT_SYMBOL(kinematicsType); EXPORT_SYMBOL(kinematicsForward); EXPORT_SYMBOL(kinematicsInverse); +MODULE_LICENSE("GPL"); int comp_id; diff --git a/src/emc/kinematics/scarakins.c b/src/emc/kinematics/scarakins.c index e3b87ee22..59c9d899f 100644 --- a/src/emc/kinematics/scarakins.c +++ b/src/emc/kinematics/scarakins.c @@ -194,6 +194,7 @@ EXPORT_SYMBOL(kinematicsType); EXPORT_SYMBOL(kinematicsForward); EXPORT_SYMBOL(kinematicsInverse); EXPORT_SYMBOL(kinematicsHome); +MODULE_LICENSE("GPL"); int comp_id; diff --git a/src/rtapi/rtai_rtapi.c b/src/rtapi/rtai_rtapi.c index 8baf179ba..136d4edd6 100644 --- a/src/rtapi/rtai_rtapi.c +++ b/src/rtapi/rtai_rtapi.c @@ -65,7 +65,7 @@ #include <linux/slab.h> /* replaces malloc.h in recent kernels */ #include <linux/ctype.h> /* isdigit */ #include <linux/uaccess.h> /* copy_from_user() */ -#include <asm/msr.h> /* rdtscll() */ +#include <asm/msr.h> /* rdtsc_ordered() */ /* get inb(), outb(), ioperm() */ #include <asm/io.h> @@ -536,7 +536,7 @@ long long int rtapi_get_clocks(void) { long long int retval; - rdtscll(retval); + retval = rdtsc_ordered(); return retval; } -- 2.26.0 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
