Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull arm64 fixes from Catalin Marinas:

- Fix a build error with CONFIG_CFI_CLANG + CONFIG_FTRACE when
CONFIG_FUNCTION_GRAPH_TRACER is not enabled.

- Fix a BUG_ON triggered by the page table checker due to incorrect
file_map_count for non-leaf pmd/pud (the arm64
pmd_user_accessible_page() not checking whether it's a leaf entry).

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud
arm64: ftrace: Define ftrace_stub_graph only with FUNCTION_GRAPH_TRACER

Linus Torvalds 3 years ago 23a60a03 f4408c3d

+3 -3

2 changed files

expand all

arch

arm64

include

asm

pgtable.h

kernel

entry-ftrace.S

+2 -2

arch/arm64/include/asm/pgtable.h

··· 863 863 864 864 static inline bool pmd_user_accessible_page(pmd_t pmd) 865 865 { 866 - return pmd_present(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); 866 + return pmd_leaf(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); 867 867 } 868 868 869 869 static inline bool pud_user_accessible_page(pud_t pud) 870 870 { 871 - return pud_present(pud) && pud_user(pud); 871 + return pud_leaf(pud) && pud_user(pud); 872 872 } 873 873 #endif 874 874

+1 -1

arch/arm64/kernel/entry-ftrace.S

··· 299 299 ret 300 300 SYM_FUNC_END(ftrace_stub) 301 301 302 + #ifdef CONFIG_FUNCTION_GRAPH_TRACER 302 303 SYM_TYPED_FUNC_START(ftrace_stub_graph) 303 304 ret 304 305 SYM_FUNC_END(ftrace_stub_graph) 305 306 306 - #ifdef CONFIG_FUNCTION_GRAPH_TRACER 307 307 /* 308 308 * void return_to_handler(void) 309 309 *