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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 C2719C47E49 for ; Thu, 24 Oct 2019 04:09:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 813962166E for ; Thu, 24 Oct 2019 04:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 813962166E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 13CB26B0005; Thu, 24 Oct 2019 00:09:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0ED726B0006; Thu, 24 Oct 2019 00:09:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 002046B0007; Thu, 24 Oct 2019 00:09:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0043.hostedemail.com [216.40.44.43]) by kanga.kvack.org (Postfix) with ESMTP id CEC6C6B0005 for ; Thu, 24 Oct 2019 00:09:12 -0400 (EDT) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 5C0AE180ACEE4 for ; Thu, 24 Oct 2019 04:09:12 +0000 (UTC) X-FDA: 76077348144.28.worm67_161646f4ac640 X-HE-Tag: worm67_161646f4ac640 X-Filterd-Recvd-Size: 11608 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Thu, 24 Oct 2019 04:09:11 +0000 (UTC) Received: from [10.44.0.22] (unknown [103.48.210.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 914102075C; Thu, 24 Oct 2019 04:09:04 +0000 (UTC) Subject: Re: [PATCH 04/12] m68k: nommu: use pgtable-nopud instead of 4level-fixup To: Mike Rapoport , linux-mm@kvack.org Cc: Andrew Morton , Anton Ivanov , Arnd Bergmann , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Helge Deller , "James E.J. Bottomley" , Jeff Dike , "Kirill A. Shutemov" , Linus Torvalds , Mark Salter , Matt Turner , Michal Simek , Richard Weinberger , Russell King , Sam Creasey , Vincent Chen , Vineet Gupta , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, sparclinux@vger.kernel.org, Mike Rapoport References: <1571822941-29776-1-git-send-email-rppt@kernel.org> <1571822941-29776-5-git-send-email-rppt@kernel.org> From: Greg Ungerer Message-ID: Date: Thu, 24 Oct 2019 14:09:01 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1571822941-29776-5-git-send-email-rppt@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Mike, On 23/10/19 7:28 pm, Mike Rapoport wrote: > From: Mike Rapoport >=20 > The generic nommu implementation of page table manipulation takes care = of > folding of the upper levels and does not require fixups. >=20 > Simply replace of include/asm-generic/4level-fixup.h with > include/asm-generic/pgtable-nopud.h. >=20 > Signed-off-by: Mike Rapoport > --- > arch/m68k/include/asm/pgtable_no.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm= /pgtable_no.h > index c18165b..ccc4568 100644 > --- a/arch/m68k/include/asm/pgtable_no.h > +++ b/arch/m68k/include/asm/pgtable_no.h > @@ -2,7 +2,7 @@ > #ifndef _M68KNOMMU_PGTABLE_H > #define _M68KNOMMU_PGTABLE_H > =20 > -#include > +#include > =20 > /* > * (C) Copyright 2000-2002, Greg Ungerer This fails to compile for me (targeting m5208evb_defconfig): CC init/main.o In file included from ./arch/m68k/include/asm/pgtable_no.h:56:0, from ./arch/m68k/include/asm/pgtable.h:3, from ./include/linux/mm.h:99, from ./include/linux/ring_buffer.h:5, from ./include/linux/trace_events.h:6, from ./include/trace/syscall.h:7, from ./include/linux/syscalls.h:85, from init/main.c:21: ./include/asm-generic/pgtable.h:738:34: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline int pmd_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:748:15: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_mksoft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:748:38: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_mksoft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:758:15: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_clear_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:758:42: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_clear_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:778:15: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:778:42: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:783:38: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline int pmd_swp_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:788:15: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:788:46: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t pmd) ^ ./include/asm-generic/pgtable.h:1071:32: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t p= rot) ^ ./include/asm-generic/pgtable.h:1083:34: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline int pmd_clear_huge(pmd_t *pmd) ^ ./include/asm-generic/pgtable.h:1095:37: error: unknown type name =E2=80=98= pmd_t=E2=80=99 static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) ^ In file included from ./include/linux/ring_buffer.h:5:0, from ./include/linux/trace_events.h:6, from ./include/trace/syscall.h:7, from ./include/linux/syscalls.h:85, from init/main.c:21: ./include/linux/mm.h:423:2: error: unknown type name =E2=80=98pmd_t=E2=80= =99 pmd_t *pmd; /* Pointer to pmd entry matching ^ ./include/linux/mm.h:568:30: error: unknown type name =E2=80=98pmd_t=E2=80= =99 static inline int pmd_devmap(pmd_t pmd) ^ In file included from ./include/linux/mm.h:587:0, from ./include/linux/ring_buffer.h:5, from ./include/linux/trace_events.h:6, from ./include/trace/syscall.h:7, from ./include/linux/syscalls.h:85, from init/main.c:21: ./include/linux/huge_mm.h:12:5: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr, ^ ./include/linux/huge_mm.h:12:21: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr, ^ ./include/linux/huge_mm.h:14:57: error: unknown type name =E2=80=98pmd_t=E2= =80=99 extern void huge_pmd_set_accessed(struct vm_fault *vmf, pmd_t orig_pmd)= ; ^ ./include/linux/huge_mm.h:27:61: error: unknown type name =E2=80=98pmd_t=E2= =80=99 extern vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf, pmd_t orig_= pmd); ^ ./include/linux/huge_mm.h:30:8: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *pmd, ^ ./include/linux/huge_mm.h:34:4: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *pmd, unsigned long addr, unsigned long next); ^ ./include/linux/huge_mm.h:37:4: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *pmd, unsigned long addr); ^ ./include/linux/huge_mm.h:41:57: error: unknown type name =E2=80=98pmd_t=E2= =80=99 extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, ^ ./include/linux/huge_mm.h:46:5: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *old_pmd, pmd_t *new_pmd); ^ ./include/linux/huge_mm.h:46:21: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t *old_pmd, pmd_t *new_pmd); ^ ./include/linux/huge_mm.h:47:56: error: unknown type name =E2=80=98pmd_t=E2= =80=99 extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, ^ ./include/linux/huge_mm.h:336:65: error: unknown type name =E2=80=98pmd_t= =E2=80=99 static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *= pmd, ^ ./include/linux/huge_mm.h:356:31: error: unknown type name =E2=80=98pmd_t= =E2=80=99 static inline int is_swap_pmd(pmd_t pmd) ^ ./include/linux/huge_mm.h:360:47: error: unknown type name =E2=80=98pmd_t= =E2=80=99 static inline spinlock_t *pmd_trans_huge_lock(pmd_t *pmd, ^ ./include/linux/huge_mm.h:372:3: error: unknown type name =E2=80=98pmd_t=E2= =80=99 pmd_t orig_pmd) ^ ./include/linux/huge_mm.h:393:22: error: unknown type name =E2=80=98pmd_t= =E2=80=99 unsigned long addr, pmd_t *pmd, int flags, struct dev_pagemap **pgmap) ^ In file included from ./include/linux/ring_buffer.h:5:0, from ./include/linux/trace_events.h:6, from ./include/trace/syscall.h:7, from ./include/linux/syscalls.h:85, from init/main.c:21: ./include/linux/mm.h:1447:5: error: unknown type name =E2=80=98pmd_t=E2=80= =99 pmd_t pmd); ^ ./include/linux/mm.h:1464:21: error: unknown type name =E2=80=98pmd_t=E2=80= =99 pte_t **ptepp, pmd_t **pmdpp, spinlock_t **ptlp); ^ ./include/linux/mm.h:1850:39: error: unknown type name =E2=80=98pmd_t=E2=80= =99 int __pte_alloc(struct mm_struct *mm, pmd_t *pmd); ^ ./include/linux/mm.h:1851:24: error: unknown type name =E2=80=98pmd_t=E2=80= =99 int __pte_alloc_kernel(pmd_t *pmd); ^ ./include/linux/mm.h:1937:61: error: unknown type name =E2=80=98pmd_t=E2=80= =99 static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) ^ ./include/linux/mm.h:2028:61: error: unknown type name =E2=80=98pmd_t=E2=80= =99 static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd) ^ ./include/linux/mm.h:2040:58: error: unknown type name =E2=80=98pmd_t=E2=80= =99 static inline spinlock_t *pmd_lock(struct mm_struct *mm, pmd_t *pmd) ^ In file included from ./include/linux/ring_buffer.h:5:0, from ./include/linux/trace_events.h:6, from ./include/trace/syscall.h:7, from ./include/linux/syscalls.h:85, from init/main.c:21: ./include/linux/mm.h:2755:1: error: unknown type name =E2=80=98pmd_t=E2=80= =99 pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node); ^ ./include/linux/mm.h:2756:29: error: unknown type name =E2=80=98pmd_t=E2=80= =99 pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node); ^ scripts/Makefile.build:265: recipe for target 'init/main.o' failed make[1]: *** [init/main.o] Error 1 Makefile:1649: recipe for target 'init' failed make: *** [init] Error 2 Regards Greg