Commit 23a60a03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/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
parents f4408c3d 5b47348f

arch/arm64/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -863,12 +863,12 @@ static inline bool pte_user_accessible_page(pte_t pte) 


static inline bool pmd_user_accessible_page(pmd_t pmd)

{

	return pmd_present(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd));

	return pmd_leaf(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd));

}



static inline bool pud_user_accessible_page(pud_t pud)

{

	return pud_present(pud) && pud_user(pud);

	return pud_leaf(pud) && pud_user(pud);

}

#endif

arch/arm64/kernel/entry-ftrace.S

+1 −1
Original line number Diff line number Diff line
@@ -299,11 +299,11 @@ SYM_TYPED_FUNC_START(ftrace_stub) 
	ret

SYM_FUNC_END(ftrace_stub)



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

SYM_TYPED_FUNC_START(ftrace_stub_graph)

	ret

SYM_FUNC_END(ftrace_stub_graph)



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

/*

 * void return_to_handler(void)

 *