diff options
author | Alexander Aksenov <a.aksenov@samsung.com> | 2013-11-11 15:18:08 +0400 |
---|---|---|
committer | Alexander Aksenov <a.aksenov@samsung.com> | 2013-11-12 12:09:47 +0400 |
commit | fd925a70aaa530e10715fd25fbbb8676e8b0ce2f (patch) | |
tree | 1cd4c5354957d02ef627515e6123daa0b75b8b39 | |
parent | 742b63e6f99ed6abf20fdcb802135f6b199133ab (diff) | |
download | swap-modules-fd925a70aaa530e10715fd25fbbb8676e8b0ce2f.tar.gz swap-modules-fd925a70aaa530e10715fd25fbbb8676e8b0ce2f.tar.bz2 swap-modules-fd925a70aaa530e10715fd25fbbb8676e8b0ce2f.zip |
[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>
-rwxr-xr-x | build.sh | 2 | ||||
-rw-r--r-- | us_manager/helper.c | 6 | ||||
-rw-r--r-- | us_manager/pf/pf_group.c | 10 | ||||
-rw-r--r-- | us_manager/pf/proc_filters.c | 2 | ||||
-rw-r--r-- | us_manager/sspt/sspt.h | 6 | ||||
-rw-r--r-- | us_manager/sspt/sspt_debug.h | 2 | ||||
-rw-r--r-- | us_manager/sspt/sspt_file.c | 2 | ||||
-rw-r--r-- | us_manager/sspt/sspt_proc.c | 2 | ||||
-rw-r--r-- | us_manager/us_slot_manager.c | 4 |
9 files changed, 18 insertions, 18 deletions
@@ -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 51d967ff..625edf21 100644 --- 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 841116aa..0cd90534 100644 --- 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 cb501a3d..cce88ec8 100644 --- 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 7367f8a4..2a940723 100644 --- 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 5e5b8f32..7d8fc483 100644 --- 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 a82e2518..86652abc 100644 --- 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 3534247d..cb4ef728 100644 --- 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 cd8ddfd5..4a371e93 100644 --- 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) { |