From patchwork Tue Jun 27 22:14:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 113631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8508012vqr; Tue, 27 Jun 2023 15:27:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52PHL13snRiPqZq1GVsUBkS8Q4cAEfmuKLFDcd/UQt5ZzcimTN406m5n7GdF38pPTqbmhx X-Received: by 2002:a17:907:d0f:b0:94e:e30e:7245 with SMTP id gn15-20020a1709070d0f00b0094ee30e7245mr32137521ejc.8.1687904829455; Tue, 27 Jun 2023 15:27:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687904829; cv=none; d=google.com; s=arc-20160816; b=JXT5AxssWg3fZZWVzLox0coXCGRaE6CaU3sKOWCPCaWHL1C0wH2enoXnMhzyAXH0cO BGRaqA0BAZejHncssbw7gF+ZUzXPBsZ0gmSh67iniIWHiWabCpc7b8hslSpfef7h+h0H TWdnXR+AoZLOCUzG0+98HfSQYkmR0u+W2qVPDQySDxx0Otjn8N5Az6hdtxuM1GKtBLJf 2tUTJ2rsO9+jhxBOZuvlQrAMQgUNTCbBYeCc7a6p9DiaqUZVfr9OTamd+dbG/lYd49Nl KelJt4KGE5uxOPDK2O5PfKHocaPFaiUZoIAs0yGZfZX86PlU7QbsVzJ71/PYlK9F6m2l 1l4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=cCON27nm8AIsfHyiqIUBZqaRT6yjniJrnZgg4IRWLN0=; fh=vLTTGeauCc/MPTDragkfHJSrt+nMhs/klsnkkc2xxyE=; b=dFS25xTjxRcLAnBr2IkfB5t702ebzV1l3UQOzGKAKbCmJi974T/42n0yh1fEp2j9s4 PU0821HWob/Q4afVz8c77jcyVMXUa3J3sNtDjDHY0tHDsvpUon0ShUG1UvXT89Ig7z+G bZ8WGjLARZuaVFJ9rC5pCczJ3ThzZDVhUn3n0E5WXKjRwuLSw3EhsPvMnRDl/RBbnoIo hN/QmE+Yb62IR4rcbOXJxvuEXfGgRv8pwy2KbOMXBlZH7s6u2yxO8X3Co61BtTp0Z6im 1gO2b97WRnHQVgLFHRSaJGhWuknF8FqKJHlRJT653E2QoJlAs/gGC9n9LVcs2DcmMObP VGcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XerVoOK0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s27-20020a170906169b00b0098f564f636esi3374003ejd.132.2023.06.27.15.26.42; Tue, 27 Jun 2023 15:27:09 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XerVoOK0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229593AbjF0WOy (ORCPT + 99 others); Tue, 27 Jun 2023 18:14:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjF0WOr (ORCPT ); Tue, 27 Jun 2023 18:14:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B9571FCD for ; Tue, 27 Jun 2023 15:14:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 638AB61239 for ; Tue, 27 Jun 2023 22:14:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AC2FC433C0; Tue, 27 Jun 2023 22:14:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687904084; bh=PWkigw51oTYP+QIZeGiN4X++ycxgw6EELB6XK+Bx1vw=; h=From:To:Cc:Subject:Date:From; b=XerVoOK0uI9k692hzjtE2HMcyTWHTJoxtigXk8K/TM2i4cLAstZzJUvN/wvW5VQV7 9CbGCLwjBq2zY7ai8tLoMx/tvETP2XXCmcmTK3awbJjL2I9YG4n6J62BVOLq4NO0kQ qra5WzkLK+50FtAsXyEjZ6YjX2ohn6iibEdHs3OQwfuwWntIv2WbCiSEiB58hwkll/ Qa4SAp3+YAuUlBT3CQTMHCuhGHU9Tu9tyYdQHc2QhsIBGcDQV8oT/L0ogXTM2smj4I W4TK3yme41VLqb6d6m+0X3U2tc9zeGn2FJk00ofzWBKbg1WOw6/R2iyeh3VaAxbPfl v/KFm8MsUuItw== From: Dinh Nguyen To: torvalds@linux-foundation.org Cc: dinguyen@kernel.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, vishal.moola@gmail.com, akpm@linux-foundation.org, sfr@canb.auug.org.au Subject: [PATCH] Revert "nios2: Convert __pte_free_tlb() to use ptdescs" Date: Tue, 27 Jun 2023 17:14:30 -0500 Message-Id: <20230627221430.464073-1-dinguyen@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1769896494457700432?= X-GMAIL-MSGID: =?utf-8?q?1769896494457700432?= This reverts commit 6ebe94baa2b9ddf3ccbb7f94df6ab26234532734. The patch "nios2: Convert __pte_free_tlb() to use ptdescs" was supposed to go together with a patchset that Vishal Moola had planned taking it through the mm tree. By just having this patch, all NIOS2 builds are broken. Signed-off-by: Dinh Nguyen --- arch/nios2/include/asm/pgalloc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h index ce6bb8e74271..ecd1657bb2ce 100644 --- a/arch/nios2/include/asm/pgalloc.h +++ b/arch/nios2/include/asm/pgalloc.h @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, extern pgd_t *pgd_alloc(struct mm_struct *mm); -#define __pte_free_tlb(tlb, pte, addr) \ - do { \ - pagetable_pte_dtor(page_ptdesc(pte)); \ - tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ +#define __pte_free_tlb(tlb, pte, addr) \ + do { \ + pgtable_pte_page_dtor(pte); \ + tlb_remove_page((tlb), (pte)); \ } while (0) #endif /* _ASM_NIOS2_PGALLOC_H */