diff options
author | Vyacheslav Cherkashin <v.cherkashin@samsung.com> | 2014-10-22 14:49:26 +0400 |
---|---|---|
committer | Vyacheslav Cherkashin <v.cherkashin@samsung.com> | 2014-10-22 14:49:26 +0400 |
commit | a5784e6a2d85acc7619d7555fc834abe5cb17337 (patch) | |
tree | 6d457d6ddcc1f20bcd8ed7cf8bd8ca9f3177f08d /kprobe | |
parent | f23ee6ff179fee3fe6c4820ecacdc2029db28a99 (diff) | |
download | swap-modules-a5784e6a2d85acc7619d7555fc834abe5cb17337.tar.gz swap-modules-a5784e6a2d85acc7619d7555fc834abe5cb17337.tar.bz2 swap-modules-a5784e6a2d85acc7619d7555fc834abe5cb17337.zip |
[IMPROVE] remove links to build modules
Change-Id: Ibf0bdd848e3e03c9b5c1b4c9b5ec8390c8886bfd
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Diffstat (limited to 'kprobe')
-rw-r--r-- | kprobe/Kbuild | 15 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/memory_rwx.c (renamed from kprobe/arch/asm-arm/memory_rwx.c) | 0 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/memory_rwx.h (renamed from kprobe/arch/asm-arm/memory_rwx.h) | 0 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/swap_kprobes.c (renamed from kprobe/arch/asm-arm/swap_kprobes.c) | 0 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/swap_kprobes.h (renamed from kprobe/arch/asm-arm/swap_kprobes.h) | 0 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/trampoline_arm.S (renamed from kprobe/arch/asm-arm/trampoline_arm.S) | 0 | ||||
-rw-r--r-- | kprobe/arch/arm/swap-asm/trampoline_arm.h (renamed from kprobe/arch/asm-arm/trampoline_arm.h) | 0 | ||||
-rw-r--r-- | kprobe/arch/x86/swap-asm/swap_kprobes.c (renamed from kprobe/arch/asm-x86/swap_kprobes.c) | 0 | ||||
-rw-r--r-- | kprobe/arch/x86/swap-asm/swap_kprobes.h (renamed from kprobe/arch/asm-x86/swap_kprobes.h) | 0 | ||||
-rw-r--r-- | kprobe/swap_kprobes.c | 2 | ||||
-rw-r--r-- | kprobe/swap_kprobes.h | 2 |
11 files changed, 10 insertions, 9 deletions
diff --git a/kprobe/Kbuild b/kprobe/Kbuild index 4a71126c..640899fd 100644 --- a/kprobe/Kbuild +++ b/kprobe/Kbuild @@ -3,14 +3,15 @@ EXTRA_CFLAGS := $(extra_cflags) obj-m := swap_kprobe.o swap_kprobe-y := swap_kprobes.o \ swap_kprobes_deps.o \ - arch/asm/swap_kprobes.o \ swap_slots.o -ifeq ($(CONFIG_ARM), y) -swap_kprobe-y += arch/asm/trampoline_arm.o - +### ARM +swap_kprobe-$(CONFIG_ARM) += arch/arm/swap-asm/swap_kprobes.o \ + arch/arm/swap-asm/trampoline_arm.o ifeq ($(CONFIG_STRICT_MEMORY_RWX), y) -swap_kprobe-y += arch/asm/memory_rwx.o -endif # CONFIG_STRICT_MEMORY_RWX +swap_kprobe-$(CONFIG_ARM) += arch/arm/swap-asm/memory_rwx.o +endif #ifeq ($(CONFIG_STRICT_MEMORY_RWX), y) + -endif # CONFIG_ARM
\ No newline at end of file +### X86 +swap_kprobe-$(CONFIG_X86) += arch/x86/swap-asm/swap_kprobes.o diff --git a/kprobe/arch/asm-arm/memory_rwx.c b/kprobe/arch/arm/swap-asm/memory_rwx.c index bb751a66..bb751a66 100644 --- a/kprobe/arch/asm-arm/memory_rwx.c +++ b/kprobe/arch/arm/swap-asm/memory_rwx.c diff --git a/kprobe/arch/asm-arm/memory_rwx.h b/kprobe/arch/arm/swap-asm/memory_rwx.h index 97879bba..97879bba 100644 --- a/kprobe/arch/asm-arm/memory_rwx.h +++ b/kprobe/arch/arm/swap-asm/memory_rwx.h diff --git a/kprobe/arch/asm-arm/swap_kprobes.c b/kprobe/arch/arm/swap-asm/swap_kprobes.c index e0b989b1..e0b989b1 100644 --- a/kprobe/arch/asm-arm/swap_kprobes.c +++ b/kprobe/arch/arm/swap-asm/swap_kprobes.c diff --git a/kprobe/arch/asm-arm/swap_kprobes.h b/kprobe/arch/arm/swap-asm/swap_kprobes.h index fb23151d..fb23151d 100644 --- a/kprobe/arch/asm-arm/swap_kprobes.h +++ b/kprobe/arch/arm/swap-asm/swap_kprobes.h diff --git a/kprobe/arch/asm-arm/trampoline_arm.S b/kprobe/arch/arm/swap-asm/trampoline_arm.S index e4831773..e4831773 100644 --- a/kprobe/arch/asm-arm/trampoline_arm.S +++ b/kprobe/arch/arm/swap-asm/trampoline_arm.S diff --git a/kprobe/arch/asm-arm/trampoline_arm.h b/kprobe/arch/arm/swap-asm/trampoline_arm.h index 257aca8c..257aca8c 100644 --- a/kprobe/arch/asm-arm/trampoline_arm.h +++ b/kprobe/arch/arm/swap-asm/trampoline_arm.h diff --git a/kprobe/arch/asm-x86/swap_kprobes.c b/kprobe/arch/x86/swap-asm/swap_kprobes.c index 0e671f96..0e671f96 100644 --- a/kprobe/arch/asm-x86/swap_kprobes.c +++ b/kprobe/arch/x86/swap-asm/swap_kprobes.c diff --git a/kprobe/arch/asm-x86/swap_kprobes.h b/kprobe/arch/x86/swap-asm/swap_kprobes.h index ce6e7a10..ce6e7a10 100644 --- a/kprobe/arch/asm-x86/swap_kprobes.h +++ b/kprobe/arch/x86/swap-asm/swap_kprobes.h diff --git a/kprobe/swap_kprobes.c b/kprobe/swap_kprobes.c index b5983e4f..697b7897 100644 --- a/kprobe/swap_kprobes.c +++ b/kprobe/swap_kprobes.c @@ -42,7 +42,7 @@ #include <linux/pagemap.h> #include <ksyms/ksyms.h> -#include <kprobe/arch/asm/swap_kprobes.h> +#include <swap-asm/swap_kprobes.h> #include "swap_slots.h" #include "swap_kdebug.h" diff --git a/kprobe/swap_kprobes.h b/kprobe/swap_kprobes.h index 944bb44e..5f1ed626 100644 --- a/kprobe/swap_kprobes.h +++ b/kprobe/swap_kprobes.h @@ -43,7 +43,7 @@ #include <linux/sched.h> #include <linux/pagemap.h> -#include <kprobe/arch/asm/swap_kprobes.h> +#include <swap-asm/swap_kprobes.h> #ifdef CONFIG_ARM |