aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/alternative.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-07-03 09:20:22 +0200
committerIngo Molnar <mingo@kernel.org>2018-07-03 09:20:22 +0200
commit4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch)
tree7b983b8cf20c6154cf897000610c5b7c754e26d9 /arch/arm64/include/asm/alternative.h
parentsched/fair: Remove stale tg_unthrottle_up() comments (diff)
parentkthread, sched/core: Fix kthread_parkme() (again...) (diff)
downloadlinux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz
linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.zip
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/alternative.h')
-rw-r--r--arch/arm64/include/asm/alternative.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h
index a91933b1e2e6..4b650ec1d7dd 100644
--- a/arch/arm64/include/asm/alternative.h
+++ b/arch/arm64/include/asm/alternative.h
@@ -28,7 +28,12 @@ typedef void (*alternative_cb_t)(struct alt_instr *alt,
__le32 *origptr, __le32 *updptr, int nr_inst);
void __init apply_alternatives_all(void);
-void apply_alternatives(void *start, size_t length);
+
+#ifdef CONFIG_MODULES
+void apply_alternatives_module(void *start, size_t length);
+#else
+static inline void apply_alternatives_module(void *start, size_t length) { }
+#endif
#define ALTINSTR_ENTRY(feature,cb) \
" .word 661b - .\n" /* label */ \