diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 11:30:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 11:30:54 -0500 |
| commit | e9f2d6d66037cdf97487491e04053f411abc5d16 (patch) | |
| tree | 123cec080d17fb74a2531d8cc7ad1cf44bbad9ec /arch/arm/kernel/patch.h | |
| parent | fbe4dd088f449cbae586aa8af51d271297c75f9f (diff) | |
| parent | 06e944b8e5fc4bec83f102f98c1ee4f972f5f072 (diff) | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel/patch.h')
| -rw-r--r-- | arch/arm/kernel/patch.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/kernel/patch.h b/arch/arm/kernel/patch.h index b4731f2dac38..77e054c2f6cd 100644 --- a/arch/arm/kernel/patch.h +++ b/arch/arm/kernel/patch.h | |||
| @@ -2,6 +2,16 @@ | |||
| 2 | #define _ARM_KERNEL_PATCH_H | 2 | #define _ARM_KERNEL_PATCH_H |
| 3 | 3 | ||
| 4 | void patch_text(void *addr, unsigned int insn); | 4 | void patch_text(void *addr, unsigned int insn); |
| 5 | void __patch_text(void *addr, unsigned int insn); | 5 | void __patch_text_real(void *addr, unsigned int insn, bool remap); |
| 6 | |||
| 7 | static inline void __patch_text(void *addr, unsigned int insn) | ||
| 8 | { | ||
| 9 | __patch_text_real(addr, insn, true); | ||
| 10 | } | ||
| 11 | |||
| 12 | static inline void __patch_text_early(void *addr, unsigned int insn) | ||
| 13 | { | ||
| 14 | __patch_text_real(addr, insn, false); | ||
| 15 | } | ||
| 6 | 16 | ||
| 7 | #endif | 17 | #endif |