github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: arm64: add __nocfi to __apply_alternatives"

Browse Source 
This reverts commit 2e34bc14ef as CFI is
being removed from the tree to come back later as a "clean" set of
patches.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I209609a6396a0bef2acee70beb1f7f9390c51cbd
This commit is contained in:
Greg Kroah-Hartman 2020-07-17 14:57:20 +02:00
parent 72091fcab8
commit 2aea973913
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kernel/alternative.c
View File

@ -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;