From 742b63e6f99ed6abf20fdcb802135f6b199133ab Mon Sep 17 00:00:00 2001
From: Alexander Aksenov <a.aksenov@samsung.com>
Date: Tue, 12 Nov 2013 12:08:47 +0400
Subject: [PATCH] [FIX] arch includes for kprobe, uprobe, ks_{manager,feature}

Change-Id: Ib22fded7e99917399baf5df8ebd104d37ad50b31
Signed-off-by: Alexander Aksenov <a.aksenov@samsung.com>
---
 build.sh             | 8 ++++----
 kprobe/dbi_kprobes.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 8fd552c..85561c9 100755
--- a/build.sh
+++ b/build.sh
@@ -58,17 +58,17 @@ 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_arch_dir}" \
+	extra_cflags="-Werror -I${modules_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${modules_dir} -I${kprobe_arch_dir}" \
+	extra_cflags="-Werror -I${modules_dir}" \
 	modules || exit 1
 
 uprobe_module_name=swap_uprobe.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${uprobe_dir} \
-	extra_cflags="-Werror -I${modules_dir} -I${kprobe_dir} -I${kprobe_arch_dir} -I${uprobe_dir} -I${uprobe_arch_dir}" \
+	extra_cflags="-Werror -I${modules_dir}" \
 	modules || exit 1
 
 us_manager_module_name=swap_us_manager.ko
@@ -78,7 +78,7 @@ make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${us_manager
 
 ks_features_module_name=swap_ks_features.ko
 make CROSS_COMPILE=${cross_compile} ARCH=${arch} -C ${kernel_dir} M=${ks_features_dir} \
-	extra_cflags="-Werror -I${modules_dir} -I${kprobe_arch_dir}" \
+	extra_cflags="-Werror -I${modules_dir}" \
 	modules || exit 1
 
 sampler_module_name=swap_sampler.ko
diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index ebbf305..a595057 100644
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -47,7 +47,7 @@
  */
 
 #include "dbi_kprobes.h"
-#include <asm/dbi_kprobes.h>
+#include <kprobe/arch/asm/dbi_kprobes.h>
 
 #include "dbi_kdebug.h"
 #include "dbi_kprobes_deps.h"
-- 
2.7.4