[FIX] change paths and remove redundant includes in kprobe

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

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

diff --git a/build.sh b/build.sh
index 8784246..ea5b284 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -58,12 +58,12 @@ make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${writer_dir
 
 kprobe_module_name=swap_kprobe.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${kprobe_dir} \
-       extra_cflags="-Werror -I${modules_dir} -I${kprobe_dir} -I${kprobe_arch_dir} -I${ksyms_dir}" \
+       extra_cflags="-Werror -I${modules_dir} -I${kprobe_arch_dir}" \
        modules || exit 1
 
 ks_manager_module_name=swap_ks_manager.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${ks_manager_dir} \
-       extra_cflags="-Werror -I${kprobe_dir} -I${kprobe_arch_dir}" \
+       extra_cflags="-Werror -I${modules_dir} -I${kprobe_dir} -I${kprobe_arch_dir}" \
        modules || exit 1
 
 uprobe_module_name=swap_uprobe.ko

diff --git a/kprobe/arch/asm-arm/dbi_kprobes.c b/kprobe/arch/asm-arm/dbi_kprobes.c
index a24dfb8..671b36b 100644 (file)
--- a/kprobe/arch/asm-arm/dbi_kprobes.c
+++ b/kprobe/arch/asm-arm/dbi_kprobes.c
@@ -34,13 +34,12 @@
 
 #include "dbi_kprobes.h"
 #include "trampoline_arm.h"
-#include "../dbi_kprobes.h"
-#include "../../dbi_kprobes.h"
+#include <kprobe/dbi_kprobes.h>
 
-#include "../../dbi_kdebug.h"
-#include "../../dbi_insn_slots.h"
-#include "../../dbi_kprobes_deps.h"
-#include <ksyms.h>
+#include <kprobe/dbi_kdebug.h>
+#include <kprobe/dbi_insn_slots.h>
+#include <kprobe/dbi_kprobes_deps.h>
+#include <ksyms/ksyms.h>
 
 #include <asm/cacheflush.h>
 #include <asm/traps.h>

diff --git a/kprobe/arch/asm-mips/dbi_kprobes.c b/kprobe/arch/asm-mips/dbi_kprobes.c
index 796810a..f042455 100644 (file)
--- a/kprobe/arch/asm-mips/dbi_kprobes.c
+++ b/kprobe/arch/asm-mips/dbi_kprobes.c
@@ -26,14 +26,13 @@
  */
 
 #include "dbi_kprobes.h"
-#include "../dbi_kprobes.h"
-#include "../../dbi_kprobes.h"
-
-#include "../../dbi_kdebug.h"
-#include "../../dbi_insn_slots.h"
-#include "../../dbi_kprobes_deps.h"
-#include "../../dbi_uprobes.h"
-#include <ksyms.h>
+#include <kprobe/dbi_kprobes.h>
+
+#include <kprobe/dbi_kdebug.h>
+#include <kprobe/dbi_insn_slots.h>
+#include <kprobe/dbi_kprobes_deps.h>
+#include <kprobe/dbi_uprobes.h>
+#include <ksyms/ksyms.h>
 
 #define SUPRESS_BUG_MESSAGES
 

diff --git a/kprobe/arch/asm-mips/dbi_kprobes.h b/kprobe/arch/asm-mips/dbi_kprobes.h
index 0dceb1e..6da7154 100644 (file)
--- a/kprobe/arch/asm-mips/dbi_kprobes.h
+++ b/kprobe/arch/asm-mips/dbi_kprobes.h
@@ -28,8 +28,8 @@
  *
  */
 
-#include "../../dbi_kprobes_deps.h"
-#include "../dbi_kprobes.h"
+#include <kprobe/dbi_kprobes_deps.h>
+#include <kprobe/dbi_kprobes.h>
 
 typedef unsigned long kprobe_opcode_t;
 

diff --git a/kprobe/arch/asm-x86/dbi_kprobes.c b/kprobe/arch/asm-x86/dbi_kprobes.c
index 5432a6e..2d67539 100644 (file)
--- a/kprobe/arch/asm-x86/dbi_kprobes.c
+++ b/kprobe/arch/asm-x86/dbi_kprobes.c
@@ -49,12 +49,11 @@
 #include <linux/kdebug.h>
 
 #include "dbi_kprobes.h"
-#include "../dbi_kprobes.h"
-#include "../../dbi_kprobes.h"
+#include <kprobe/dbi_kprobes.h>
 
-#include "../../dbi_kdebug.h"
-#include "../../dbi_insn_slots.h"
-#include "../../dbi_kprobes_deps.h"
+#include <kprobe/dbi_kdebug.h>
+#include <kprobe/dbi_insn_slots.h>
+#include <kprobe/dbi_kprobes_deps.h>
 #define SUPRESS_BUG_MESSAGES
 
 extern struct kprobe * per_cpu__current_kprobe;

diff --git a/kprobe/arch/asm-x86/dbi_kprobes.h b/kprobe/arch/asm-x86/dbi_kprobes.h
index 1e29813..24cf06a 100644 (file)
--- a/kprobe/arch/asm-x86/dbi_kprobes.h
+++ b/kprobe/arch/asm-x86/dbi_kprobes.h
@@ -50,7 +50,7 @@
  */
 
 #include <linux/version.h>
-#include <dbi_kprobes_deps.h>
+#include <kprobe/dbi_kprobes_deps.h>
 
 typedef u8 kprobe_opcode_t;
 

diff --git a/kprobe/arch/asm-x86/dbi_kprobes_deps.c b/kprobe/arch/asm-x86/dbi_kprobes_deps.c
index 77b3910..853bbdf 100644 (file)
--- a/kprobe/arch/asm-x86/dbi_kprobes_deps.c
+++ b/kprobe/arch/asm-x86/dbi_kprobes_deps.c
@@ -45,7 +45,7 @@
  * 2012         Stanislav Andreev <s.andreev@samsung.com>: added time debug profiling support; BUG() message fix
  */
 
-#include "../../dbi_kprobes_deps.h"
+#include <kprobe/dbi_kprobes_deps.h>
 
 DECLARE_MOD_DEP_WRAPPER (module_alloc, void *, unsigned long size)
 IMP_MOD_DEP_WRAPPER (module_alloc, size)

diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index 2ddc920..ebbf305 100644 (file)
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -47,12 +47,12 @@
  */
 
 #include "dbi_kprobes.h"
-#include "arch/asm/dbi_kprobes.h"
+#include <asm/dbi_kprobes.h>
 
 #include "dbi_kdebug.h"
 #include "dbi_kprobes_deps.h"
 #include "dbi_insn_slots.h"
-#include <ksyms.h>
+#include <ksyms/ksyms.h>
 
 #include <linux/version.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)

diff --git a/kprobe/dbi_kprobes.h b/kprobe/dbi_kprobes.h
index b0beec9..67d7ff1 100644 (file)
--- a/kprobe/dbi_kprobes.h
+++ b/kprobe/dbi_kprobes.h
@@ -58,7 +58,7 @@
 #include <linux/sched.h>
 #include <linux/pagemap.h>
 
-#include <asm/dbi_kprobes.h>
+#include <kprobe/arch/asm/dbi_kprobes.h>
 
 
 #ifdef CONFIG_ARM

diff --git a/kprobe/dbi_kprobes_deps.h b/kprobe/dbi_kprobes_deps.h
index 58c8090..3442c32 100644 (file)
--- a/kprobe/dbi_kprobes_deps.h
+++ b/kprobe/dbi_kprobes_deps.h
@@ -32,7 +32,7 @@
 #include <linux/mempolicy.h>
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
-#include "../ksyms/ksyms.h"
+#include <ksyms/ksyms.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 #define swap_hlist_for_each_entry_rcu(tpos, pos, head, member) hlist_for_each_entry_rcu(tpos, head, member)