From patchwork Fri Nov 18 21:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13048810 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A0EDC4332F for ; Fri, 18 Nov 2022 21:37:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Yq900oFddMEuPuQi69AIRc/pJSl6ylVw/KU0eSB+ZM8=; b=eS+cinDKij8Vxd meW/JvUl941LvniyOflpaVMGmopRI3XDvs4pQF2gtopJDWMo8dPTYDyyRL/B7fna0oAdiYzouPOjY 0Cxvgv/0SScHDyMtnoUK85z2AMGzLJTeOsrXlwlCblk18+9GxYRMMBJzh8F/AmOA/ko4AXRD57XiL lVh9ekoV+SLr+BMMHtMxXBWTgIyHs7DW0fp5Tag6hlXKS4FzGSFHm5pyD2Uh0D0oUWfTBUStDDiYB tIHVMw/a4vYq89pkvdDjs7fWkVvn/1adCuM5KrjIULhqv0zfVrOEY8xO7zqVLVBvERATLzuuceYQb B+BnBVv/xiqL7YoNjW4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ow92T-008E0z-6B; Fri, 18 Nov 2022 21:36:45 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ow92P-008Dx9-Vb for linux-arm-kernel@lists.infradead.org; Fri, 18 Nov 2022 21:36:43 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B02D762795; Fri, 18 Nov 2022 21:36:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D566C433D6; Fri, 18 Nov 2022 21:36:39 +0000 (UTC) Date: Fri, 18 Nov 2022 21:36:36 +0000 From: Catalin Marinas To: Linus Torvalds Cc: Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] arm64 fixes for 6.1-rc6 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221118_133642_079757_C32D7C17 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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(-)