---

yaml --- r: 258322 b: refs/heads/master c: 691b2ff h: refs/heads/master v: v3
git-mirror · Jul 13, 2011 · fcb305f · fcb305f
1 parent ee22477
commit fcb305f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 592201a9f154cdd5db59304d1369e94d8b551803
+refs/heads/master: 691b2ff294a4787f3e54f5bb541570ac74bcb6f4
diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile
@@ -37,7 +37,8 @@ obj-$(CONFIG_HAVE_ARM_TWD)	+= smp_twd.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
-obj-$(CONFIG_KPROBES)		+= kprobes.o kprobes-decode.o
+obj-$(CONFIG_KPROBES)		+= kprobes.o
+obj-$(CONFIG_KPROBES)		+= kprobes-arm.o
 obj-$(CONFIG_ATAGS_PROC)	+= atags.o
 obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o
 obj-$(CONFIG_ARM_THUMBEE)	+= thumbee.o

diff --git a/trunk/arch/arm/kernel/kprobes-decode.c → trunk/arch/arm/kernel/kprobes-arm.c b/trunk/arch/arm/kernel/kprobes-decode.c → trunk/arch/arm/kernel/kprobes-arm.c