From fcb305f47bddf42df25d1aced5a16ebc358c62ec Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Wed, 6 Jul 2011 10:49:07 +0100 Subject: [PATCH] --- yaml --- r: 258322 b: refs/heads/master c: 691b2ff294a4787f3e54f5bb541570ac74bcb6f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/Makefile | 3 ++- trunk/arch/arm/kernel/{kprobes-decode.c => kprobes-arm.c} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename trunk/arch/arm/kernel/{kprobes-decode.c => kprobes-arm.c} (100%) diff --git a/[refs] b/[refs] index b48ef4368a96..2e68ffb9bc55 100644 --- 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 index a5b31af5c2b8..914c7a6f1706 100644 --- 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 b/trunk/arch/arm/kernel/kprobes-arm.c similarity index 100% rename from trunk/arch/arm/kernel/kprobes-decode.c rename to trunk/arch/arm/kernel/kprobes-arm.c