[GIT PULL] arm64 fixes for 6.1-rc6

From: Catalin Marinas
Date: Fri Nov 18 2022 - 16:36:45 EST


Hi Linus,

Please pull the arm64 fixes below. Thanks.

The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc:

Linux 6.1-rc4 (2022-11-06 15:07:11 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

for you to fetch changes up to 5b47348fc0b18a78c96f8474cc90b7525ad1bbfe:

arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud (2022-11-18 19:31:54 +0000)

----------------------------------------------------------------
arm64 fixes:

- 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).

----------------------------------------------------------------
Liu Shixin (1):
arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud

Sami Tolvanen (1):
arm64: ftrace: Define ftrace_stub_graph only with FUNCTION_GRAPH_TRACER

arch/arm64/include/asm/pgtable.h | 4 ++--
arch/arm64/kernel/entry-ftrace.S | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

--
Catalin