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: 22512 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp420817wrr; Fri, 18 Nov 2022 13:39:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf51tiRLpHdKuq9B0nmD27R7YWa79OeH5R3eF9PK77mqxF0PTqH6sWpR1RtBGs1IrE1kftJo X-Received: by 2002:a17:906:b04e:b0:7ad:d7f9:1f88 with SMTP id bj14-20020a170906b04e00b007add7f91f88mr7191389ejb.217.1668807572767; Fri, 18 Nov 2022 13:39:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668807572; cv=none; d=google.com; s=arc-20160816; b=VpgNe6I7notCK43OnFSj8ztrA2G+yg4GceI6DPYSzDna8hLSrd7EWjxzhHnEu2uClI XivdgnCySJW0YdZQTUTteWcFCaLkv1+QM6OgD62kv5B2LRQlV6tiCFTfQ/jksAeCkK0o FFrkEvcdzh/6kKKJcnCGAbitiFZVynbBxfT6oS+Z2bwHv6po4gMpbJsULXuNafNXSBpV mHXN2uTHqM6u9ManWSOQviOSq225ZQwzjWDtR7hT2mRviyvYA9ug2+W2vt1fW6euKf2v QIkXAviFe3Cvll+JfOrp8QEmI/ohBu4MPKv9rD9J1P87H3lvoJULrh8ZS9AF5iVRy/9+ p2Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date; bh=9KA+lZwXa4k/wJbXA3565pfb42x9witlKRgcjTS9Um0=; b=wVha19iTAHN9T6cesKRHVAnR4OIg3FvC4SKnT97MrBchNzm0vdOJ5pDBMx1AwN9cHJ jn51T/Pe9O1ViOJ8oCF45R+w1GfXjPn9VxRMdBHBdaBt4McIHLz3OKAuKrws3zr3wb2T GtzW+4O4NQbXFQqOCNI3CYuX/iK+oew17362xKD22QaeK9va9gJHY4QWnq5EWfOSPSYe id9gUwZLEYJ0OTPY4zAIKnC9nORoq1AK9lstUaERLzvyQb9NFfH6DY76CoOeIw4QiT9e NtvZ1ZD8aaY/fizA6QEdr0TphnS0IkvA1gCF2MFMBXF6Izzvg0/JJfL011MRjoC5L7B8 MN9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g3-20020a1709065d0300b0073866c0672asi5231948ejt.73.2022.11.18.13.39.07; Fri, 18 Nov 2022 13:39:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiKRVgn (ORCPT + 99 others); Fri, 18 Nov 2022 16:36:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbiKRVgl (ORCPT ); Fri, 18 Nov 2022 16:36:41 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AFD1A4641 for ; Fri, 18 Nov 2022 13:36:41 -0800 (PST) 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 AD55562579 for ; 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-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749871569478098058?= X-GMAIL-MSGID: =?utf-8?q?1749871569478098058?= 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(-)