Add support kernel v4.14

Change-Id: Id30162600c1c8cfe59a05d5b9cc9131156ee3b91
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/modules/arch/arm/uprobe/swap_uprobe.c b/modules/arch/arm/uprobe/swap_uprobe.c
index c7b2d0fa89e2fac182ef13059eb019f9788961f3..79552329c66506c3741027f1ce970dd60dfe9191 100644 (file)
--- a/modules/arch/arm/uprobe/swap_uprobe.c
+++ b/modules/arch/arm/uprobe/swap_uprobe.c
@@ -20,6 +20,10 @@
  */
 
 
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <linux/sched/task_stack.h>   /* for task_pt_regs() */
+#endif
 
 #include <arch/arm/probes/probes.h>
 #include <arch/arm/probes/probes_arm.h>

diff --git a/modules/got_patcher/gt_module.c b/modules/got_patcher/gt_module.c
index cd6898dfe2ba9cba7779c325eb413ebd79218476..fac053a385a3c2ad93071f66c36fc98d3bd67f90 100644 (file)
--- a/modules/got_patcher/gt_module.c
+++ b/modules/got_patcher/gt_module.c
@@ -3,6 +3,7 @@
 #include <linux/string.h>
 #include <linux/namei.h>
 #include <linux/slab.h>
+#include <linux/dcache.h>
 #include <linux/limits.h>
 #include <kprobe/swap_ktd.h>
 #include <us_manager/pf/pf_group.h>

diff --git a/modules/kprobe/swap_td_raw.c b/modules/kprobe/swap_td_raw.c
index 9985d06396a6b94494b9e2e0bdb74b38723c7601..0715b7c457a3a05085e7b64cbeda47ce2ae9a340 100644 (file)
--- a/modules/kprobe/swap_td_raw.c
+++ b/modules/kprobe/swap_td_raw.c
@@ -21,7 +21,14 @@
  */
 
 
-#include <linux/sched.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+# include <linux/sched.h>
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) */
+# include <linux/sched/task_stack.h>
+#endif /* LINUX_VERSION_CODE */
+
 #include <linux/module.h>
 #include "swap_td_raw.h"
 

diff --git a/modules/master/wait.h b/modules/master/wait.h
index bb1ca4bda76c1ba69ddec6720c38289047b28b81..e003027c364dbf7ecf806ebcad5d3ff556a831a9 100644 (file)
--- a/modules/master/wait.h
+++ b/modules/master/wait.h
@@ -28,10 +28,10 @@ int wait_on_atomic_t(atomic_t *val, int (*action)(atomic_t *), unsigned mode)
        return out_of_line_wait_on_atomic_t(val, action, mode);
 }
 
-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) */
-
-#include <linux/wait.h>
-
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
+# include <linux/wait.h>
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) */
+# include <linux/wait_bit.h>
+#endif /* LINUX_VERSION_CODE */
 
 #endif /* _SWAP_WAIT_H */

diff --git a/modules/sampler/swap_sampler_module.c b/modules/sampler/swap_sampler_module.c
index 1b22646b9ff39a084be0f845a13de79a1c81a0e7..6ac1aae76db52ff7692064d673e4f1ba11c3f42f 100644 (file)
--- a/modules/sampler/swap_sampler_module.c
+++ b/modules/sampler/swap_sampler_module.c
@@ -28,6 +28,11 @@
  * Timer-based sampling module.
  */
 
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <linux/sched/task_stack.h>   /* for task_pt_regs() */
+#endif
+
 #include <linux/ptrace.h>
 #include <linux/module.h>
 #include <master/swap_initializer.h>

diff --git a/modules/uprobe/arch/arm/swap-asm/swap_uprobes.c b/modules/uprobe/arch/arm/swap-asm/swap_uprobes.c
index 6da9d14faf3bedb5c7a4deb2738c83f03e8ddc18..59e7fa92f7a7b51c4b9b444cde28320526169083 100644 (file)
--- a/modules/uprobe/arch/arm/swap-asm/swap_uprobes.c
+++ b/modules/uprobe/arch/arm/swap-asm/swap_uprobes.c
@@ -31,6 +31,10 @@
  */
 
 
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <linux/sched/task_stack.h>   /* need for task_pt_regs() */
+#endif /* LINUX_VERSION_CODE */
 #include <linux/init.h>                        /* need for asm/traps.h */
 #include <linux/sched.h>               /* need for asm/traps.h */
 

diff --git a/modules/us_manager/pf/pf_group.c b/modules/us_manager/pf/pf_group.c
index be90f3c296be29c23bd23b3ecb354a42a1bbc592..867a97189a8bb1e7c62f10f43bb1acc763b94b0a 100644 (file)
--- a/modules/us_manager/pf/pf_group.c
+++ b/modules/us_manager/pf/pf_group.c
@@ -33,6 +33,8 @@
 #include <linux/version.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 # include <linux/sched/mm.h>
+# include <linux/sched/task.h>
+# include <linux/sched/signal.h>
 #endif
 #include "pf_group.h"
 #include "proc_filters.h"

diff --git a/modules/us_manager/sspt/sspt_proc.c b/modules/us_manager/sspt/sspt_proc.c
index c06e26ee1f9baadb0acae123ac20f7e12d2daa3f..e4d9159663a060e689479f74bef31a6f51329263 100644 (file)
--- a/modules/us_manager/sspt/sspt_proc.c
+++ b/modules/us_manager/sspt/sspt_proc.c
@@ -34,6 +34,7 @@
 #include <linux/version.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 # include <linux/sched/mm.h>
+# include <linux/sched/task.h>
 #endif
 #include <kprobe/swap_ktd.h>
 #include <us_manager/us_slot_manager.h>