From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 660CFC433B4 for ; Fri, 30 Apr 2021 05:30:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30E5461456 for ; Fri, 30 Apr 2021 05:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229508AbhD3FbD (ORCPT ); Fri, 30 Apr 2021 01:31:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:38694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbhD3FbC (ORCPT ); Fri, 30 Apr 2021 01:31:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26DD061423; Fri, 30 Apr 2021 05:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619760615; bh=yx7nocZqXQ3KHpdJNgXMvM6WEWVySywqLGGJwPFJZNI=; h=Date:From:To:Subject:From; b=IWLJnEhHryfqt7sqRotkqfDGirZUU9NAnYIvkQd+fc/13O49qisSNN1mKDGPnUqpD zSjId0Iwl/m+6yjrOUWq1scDyYanRgCiyH41PfA65Fbe41bGApOMhGZcDGOHWNgUJW kgE/klxsrEBMwlb7oG4I/0C8T7jrTDQIa2iXjUTM= Date: Thu, 29 Apr 2021 22:30:14 -0700 From: akpm@linux-foundation.org To: hch@lst.de, mm-commits@vger.kernel.org, npiggin@gmail.com, sfr@canb.auug.org.au Subject: [folded-merged] mm-vmalloc-remove-map_kernel_range-fix-2.patch removed from -mm tree Message-ID: <20210430053014.d9OC6DSpN%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm-vmalloc-remove-map_kernel_range-fix-2 has been removed from the -mm tree. Its filename was mm-vmalloc-remove-map_kernel_range-fix-2.patch This patch was dropped because it was folded into mm-vmalloc-remove-unmap_kernel_range.patch ------------------------------------------------------ From: Nicholas Piggin Subject: mm-vmalloc-remove-map_kernel_range-fix-2 This requires a fix for nommu builds. Link: https://lkml.kernel.org/r/1617292497.o1uhq5ipxp.astroid@bobo.none Cc: Christoph Hellwig Cc: Stephen Rothwell Signed-off-by: Andrew Morton --- mm/internal.h | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/mm/internal.h~mm-vmalloc-remove-map_kernel_range-fix-2 +++ a/mm/internal.h @@ -643,8 +643,18 @@ struct migration_target_control { /* * mm/vmalloc.c */ +#ifdef CONFIG_MMU int vmap_pages_range_noflush(unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, unsigned int page_shift); +#else +static inline +int vmap_pages_range_noflush(unsigned long addr, unsigned long end, + pgprot_t prot, struct page **pages, unsigned int page_shift) +{ + return -EINVAL; +} +#endif + void vunmap_range_noflush(unsigned long start, unsigned long end); #endif /* __MM_INTERNAL_H */ _ Patches currently in -mm which might be from npiggin@gmail.com are arm-mm-add-missing-pud_page-define-to-2-level-page-tables.patch mm-vmalloc-fix-huge_vmap-regression-by-enabling-huge-pages-in-vmalloc_to_page.patch mm-apply_to_pte_range-warn-and-fail-if-a-large-pte-is-encountered.patch mm-vmalloc-rename-vmap__range-vmap_pages__range.patch mm-ioremap-rename-ioremap__range-to-vmap__range.patch mm-huge_vmap-arch-support-cleanup.patch powerpc-inline-huge-vmap-supported-functions.patch arm64-inline-huge-vmap-supported-functions.patch x86-inline-huge-vmap-supported-functions.patch mm-vmalloc-provide-fallback-arch-huge-vmap-support-functions.patch mm-move-vmap_range-from-mm-ioremapc-to-mm-vmallocc.patch mm-vmalloc-add-vmap_range_noflush-variant.patch mm-vmalloc-hugepage-vmalloc-mappings.patch mm-vmalloc-remove-map_kernel_range.patch kernel-dma-remove-unnecessary-unmap_kernel_range.patch powerpc-xive-remove-unnecessary-unmap_kernel_range.patch mm-vmalloc-remove-unmap_kernel_range.patch mm-vmalloc-improve-allocation-failure-error-messages.patch