[FIX] change paths and remove redundant includes in us_manager

Change absolute paths to relative ones in us_manager #include.
Remove redundant includes for us_manager

Change-Id: I2af613abec3b5eeebd86c487331ea4a48c5dca37
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>

diff --git a/build.sh b/build.sh
index 85561c9..ed0c302 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -73,7 +73,7 @@ make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${uprobe_dir
 
 us_manager_module_name=swap_us_manager.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${us_manager_dir} \
-       extra_cflags="-Werror -I${modules_dir} -I${us_manager_dir} -I${kprobe_dir} -I${kprobe_arch_dir} -I${uprobe_dir} -I${uprobe_arch_dir} -I${driver_dir} -I${ksyms_dir}" \
+       extra_cflags="-Werror -I${modules_dir}" \
        modules || exit 1
 
 ks_features_module_name=swap_ks_features.ko

diff --git a/us_manager/helper.c b/us_manager/helper.c
index 51d967f..625edf2 100644 (file)
--- a/us_manager/helper.c
+++ b/us_manager/helper.c
@@ -23,9 +23,9 @@
  */
 
 
-#include <dbi_kprobes.h>
-#include <dbi_kprobes_deps.h>
-#include <ksyms.h>
+#include <kprobe/dbi_kprobes.h>
+#include <kprobe/dbi_kprobes_deps.h>
+#include <ksyms/ksyms.h>
 #include <writer/kernel_operations.h>
 #include <writer/swap_writer_module.h>
 #include "us_slot_manager.h"

diff --git a/us_manager/pf/pf_group.c b/us_manager/pf/pf_group.c
index 841116a..0cd9053 100644 (file)
--- a/us_manager/pf/pf_group.c
+++ b/us_manager/pf/pf_group.c
@@ -27,11 +27,11 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include "proc_filters.h"
-#include <img/img_proc.h>
-#include <img/img_file.h>
-#include <img/img_ip.h>
-#include <sspt/sspt_proc.h>
-#include <helper.h>
+#include <us_manager/img/img_proc.h>
+#include <us_manager/img/img_file.h>
+#include <us_manager/img/img_ip.h>
+#include <us_manager/sspt/sspt_proc.h>
+#include <us_manager/helper.h>
 #include <writer/swap_writer_module.h>
 
 struct pf_group {

diff --git a/us_manager/pf/proc_filters.c b/us_manager/pf/proc_filters.c
index cb501a3..cce88ec 100644 (file)
--- a/us_manager/pf/proc_filters.c
+++ b/us_manager/pf/proc_filters.c
@@ -28,7 +28,7 @@
 #include <linux/mm_types.h>
 #include <linux/fs.h>
 #include "proc_filters.h"
-#include <sspt/sspt.h>
+#include <us_manager/sspt/sspt.h>
 
 static int check_dentry(struct task_struct *task, struct dentry *dentry)
 {

diff --git a/us_manager/sspt/sspt.h b/us_manager/sspt/sspt.h
index 7367f8a..2a94072 100644 (file)
--- a/us_manager/sspt/sspt.h
+++ b/us_manager/sspt/sspt.h
@@ -30,11 +30,11 @@
 #include "sspt_file.h"
 #include "sspt_proc.h"
 #include "sspt_debug.h"
-#include <swap_uprobes.h>
+#include <uprobe/swap_uprobes.h>
 
 
-#include <us_manager.h>
-#include <pf/pf_group.h>
+#include <us_manager/us_manager.h>
+#include <us_manager/pf/pf_group.h>
 
 
 static inline int check_vma(struct vm_area_struct *vma)

diff --git a/us_manager/sspt/sspt_debug.h b/us_manager/sspt/sspt_debug.h
index 5e5b8f3..7d8fc48 100644 (file)
--- a/us_manager/sspt/sspt_debug.h
+++ b/us_manager/sspt/sspt_debug.h
@@ -25,7 +25,7 @@
  *
  */
 
-#include <dbi_kprobes_deps.h>
+#include <kprobe/dbi_kprobes_deps.h>
 
 static inline void print_jprobe(struct jprobe *jp)
 {

diff --git a/us_manager/sspt/sspt_file.c b/us_manager/sspt/sspt_file.c
index a82e251..86652ab 100644 (file)
--- a/us_manager/sspt/sspt_file.c
+++ b/us_manager/sspt/sspt_file.c
@@ -30,7 +30,7 @@
 #include <linux/list.h>
 #include <linux/hash.h>
 #include <linux/sched.h>
-#include <dbi_kprobes_deps.h>
+#include <kprobe/dbi_kprobes_deps.h>
 
 static int calculation_hash_bits(int cnt)
 {

diff --git a/us_manager/sspt/sspt_proc.c b/us_manager/sspt/sspt_proc.c
index 3534247..cb4ef72 100644 (file)
--- a/us_manager/sspt/sspt_proc.c
+++ b/us_manager/sspt/sspt_proc.c
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/list.h>
-#include <us_slot_manager.h>
+#include <us_manager/us_slot_manager.h>
 #include <writer/swap_writer_module.h>
 
 #define mm_read_lock(task, mm, atomic, lock)                   \

diff --git a/us_manager/us_slot_manager.c b/us_manager/us_slot_manager.c
index cd8ddfd..4a371e9 100644 (file)
--- a/us_manager/us_slot_manager.c
+++ b/us_manager/us_slot_manager.c
@@ -29,8 +29,8 @@
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/list.h>
-#include <dbi_insn_slots.h>
-#include <asm/dbi_kprobes.h>
+#include <kprobe/dbi_insn_slots.h>
+#include <kprobe/arch/asm/dbi_kprobes.h>
 
 static unsigned long alloc_user_pages(struct task_struct *task, unsigned long len, unsigned long prot, unsigned long flags)
 {