diff options
author | Rabin Vincent <rabin@rab.in> | 2012-02-18 11:50:51 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-24 05:38:55 -0400 |
commit | b21d55e98ac2bbcbbeec9a8cb091f717fd95b072 (patch) | |
tree | ad3eb60af18816acef347bc22e43059c0c0d6873 /arch/arm/kernel/Makefile | |
parent | d82227cf8f0b42ff42c21ed47025fdf54cb1698d (diff) |
ARM: 7332/1: extract out code patch function from kprobes
Extract out the code patching code from kprobes so that it can be used
from the jump label code. Additionally, the separated code:
- Uses the IS_ENABLED() macros instead of the #ifdefs for THUMB2
support
- Unifies the two separate functions in kprobes, providing one function
that uses stop_machine() internally, and one that can be called from
stop_machine() directly
- Patches the text on all CPUs only on processors requiring software
broadcasting of cache operations
Acked-by: Jon Medhurst <tixy@yxit.co.uk>
Tested-by: Jon Medhurst <tixy@yxit.co.uk>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r-- | arch/arm/kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index dd3d5f16c147..8c63ee8d3c48 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile | |||
@@ -8,6 +8,7 @@ AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET) | |||
8 | ifdef CONFIG_FUNCTION_TRACER | 8 | ifdef CONFIG_FUNCTION_TRACER |
9 | CFLAGS_REMOVE_ftrace.o = -pg | 9 | CFLAGS_REMOVE_ftrace.o = -pg |
10 | CFLAGS_REMOVE_insn.o = -pg | 10 | CFLAGS_REMOVE_insn.o = -pg |
11 | CFLAGS_REMOVE_patch.o = -pg | ||
11 | endif | 12 | endif |
12 | 13 | ||
13 | CFLAGS_REMOVE_return_address.o = -pg | 14 | CFLAGS_REMOVE_return_address.o = -pg |
@@ -38,7 +39,7 @@ obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o | |||
38 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o | 39 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o |
39 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o | 40 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o |
40 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 41 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
41 | obj-$(CONFIG_KPROBES) += kprobes.o kprobes-common.o | 42 | obj-$(CONFIG_KPROBES) += kprobes.o kprobes-common.o patch.o |
42 | ifdef CONFIG_THUMB2_KERNEL | 43 | ifdef CONFIG_THUMB2_KERNEL |
43 | obj-$(CONFIG_KPROBES) += kprobes-thumb.o | 44 | obj-$(CONFIG_KPROBES) += kprobes-thumb.o |
44 | else | 45 | else |