From 2aea973913f4c2d7304c1008cc203a6cfcf02349 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:57:20 +0200 Subject: [PATCH] Revert "ANDROID: arm64: add __nocfi to __apply_alternatives" This reverts commit 2e34bc14ef7996dd9f8adc9e49c83748054193b3 as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 145210207 Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: I209609a6396a0bef2acee70beb1f7f9390c51cbd --- arch/arm64/kernel/alternative.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index a50fb1d332e1..73039949b5ce 100644 --- a/arch/arm64/kernel/alternative.c +++ b/arch/arm64/kernel/alternative.c @@ -132,8 +132,8 @@ static void clean_dcache_range_nopatch(u64 start, u64 end) } while (cur += d_size, cur < end); } -static void __nocfi __apply_alternatives(void *alt_region, bool is_module, - unsigned long *feature_mask) +static void __apply_alternatives(void *alt_region, bool is_module, + unsigned long *feature_mask) { struct alt_instr *alt; struct alt_region *region = alt_region;