From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rapoport Subject: Re: [PATCH 04/12] m68k: nommu: use pgtable-nopud instead of 4level-fixup Date: Thu, 24 Oct 2019 08:35:34 +0300 Message-ID: <20191024053533.GA12281@rapoport-lnx> References: <1571822941-29776-1-git-send-email-rppt@kernel.org> <1571822941-29776-5-git-send-email-rppt@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Greg Ungerer Cc: "James E.J. Bottomley" , linux-mm@kvack.org, sparclinux@vger.kernel.org, Vincent Chen , Anton Ivanov , linux-arch@vger.kernel.org, linux-c6x-dev@linux-c6x.org, Richard Weinberger , Helge Deller , Russell King , Mike Rapoport , Geert Uytterhoeven , Mark Salter , Matt Turner , Jeff Dike , Sam Creasey , Arnd Bergmann , Vineet Gupta , linux-um@lists.infradead.org, linux-m68k@lists.linux-m68k.org, Greentime Hu , "Kirill A. Shutemov" , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-parisc@vger.kernel.org List-Id: linux-arch.vger.kernel.org SGkgR3JlZywKCk9uIFRodSwgT2N0IDI0LCAyMDE5IGF0IDAyOjA5OjAxUE0gKzEwMDAsIEdyZWcg VW5nZXJlciB3cm90ZToKPiBIaSBNaWtlLAo+IAo+IE9uIDIzLzEwLzE5IDc6MjggcG0sIE1pa2Ug UmFwb3BvcnQgd3JvdGU6Cj4gPkZyb206IE1pa2UgUmFwb3BvcnQgPHJwcHRAbGludXguaWJtLmNv bT4KPiA+Cj4gPlRoZSBnZW5lcmljIG5vbW11IGltcGxlbWVudGF0aW9uIG9mIHBhZ2UgdGFibGUg bWFuaXB1bGF0aW9uIHRha2VzIGNhcmUgb2YKPiA+Zm9sZGluZyBvZiB0aGUgdXBwZXIgbGV2ZWxz IGFuZCBkb2VzIG5vdCByZXF1aXJlIGZpeHVwcy4KPiA+Cj4gPlNpbXBseSByZXBsYWNlIG9mIGlu Y2x1ZGUvYXNtLWdlbmVyaWMvNGxldmVsLWZpeHVwLmggd2l0aAo+ID5pbmNsdWRlL2FzbS1nZW5l cmljL3BndGFibGUtbm9wdWQuaC4KPiA+Cj4gPlNpZ25lZC1vZmYtYnk6IE1pa2UgUmFwb3BvcnQg PHJwcHRAbGludXguaWJtLmNvbT4KPiA+LS0tCj4gPiAgYXJjaC9tNjhrL2luY2x1ZGUvYXNtL3Bn dGFibGVfbm8uaCB8IDIgKy0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEg ZGVsZXRpb24oLSkKPiA+Cj4gPmRpZmYgLS1naXQgYS9hcmNoL202OGsvaW5jbHVkZS9hc20vcGd0 YWJsZV9uby5oIGIvYXJjaC9tNjhrL2luY2x1ZGUvYXNtL3BndGFibGVfbm8uaAo+ID5pbmRleCBj MTgxNjViLi5jY2M0NTY4IDEwMDY0NAo+ID4tLS0gYS9hcmNoL202OGsvaW5jbHVkZS9hc20vcGd0 YWJsZV9uby5oCj4gPisrKyBiL2FyY2gvbTY4ay9pbmNsdWRlL2FzbS9wZ3RhYmxlX25vLmgKPiA+ QEAgLTIsNyArMiw3IEBACj4gPiAgI2lmbmRlZiBfTTY4S05PTU1VX1BHVEFCTEVfSAo+ID4gICNk ZWZpbmUgX002OEtOT01NVV9QR1RBQkxFX0gKPiA+LSNpbmNsdWRlIDxhc20tZ2VuZXJpYy80bGV2 ZWwtZml4dXAuaD4KPiA+KyNpbmNsdWRlIDxhc20tZ2VuZXJpYy9wZ3RhYmxlLW5vcHVkLmg+Cj4g PiAgLyoKPiA+ICAgKiAoQykgQ29weXJpZ2h0IDIwMDAtMjAwMiwgR3JlZyBVbmdlcmVyIDxnZXJn QHNuYXBnZWFyLmNvbT4KPiAKPiBUaGlzIGZhaWxzIHRvIGNvbXBpbGUgZm9yIG1lICh0YXJnZXRp bmcgbTUyMDhldmJfZGVmY29uZmlnKToKPiAKPiAgIENDICAgICAgaW5pdC9tYWluLm8KPiBJbiBm aWxlIGluY2x1ZGVkIGZyb20gLi9hcmNoL202OGsvaW5jbHVkZS9hc20vcGd0YWJsZV9uby5oOjU2 OjAsCj4gICAgICAgICAgICAgICAgICBmcm9tIC4vYXJjaC9tNjhrL2luY2x1ZGUvYXNtL3BndGFi bGUuaDozLAo+ICAgICAgICAgICAgICAgICAgZnJvbSAuL2luY2x1ZGUvbGludXgvbW0uaDo5OSwK PiAgICAgICAgICAgICAgICAgIGZyb20gLi9pbmNsdWRlL2xpbnV4L3JpbmdfYnVmZmVyLmg6NSwK PiAgICAgICAgICAgICAgICAgIGZyb20gLi9pbmNsdWRlL2xpbnV4L3RyYWNlX2V2ZW50cy5oOjYs Cj4gICAgICAgICAgICAgICAgICBmcm9tIC4vaW5jbHVkZS90cmFjZS9zeXNjYWxsLmg6NywKPiAg ICAgICAgICAgICAgICAgIGZyb20gLi9pbmNsdWRlL2xpbnV4L3N5c2NhbGxzLmg6ODUsCj4gICAg ICAgICAgICAgICAgICBmcm9tIGluaXQvbWFpbi5jOjIxOgo+IC4vaW5jbHVkZS9hc20tZ2VuZXJp Yy9wZ3RhYmxlLmg6NzM4OjM0OiBlcnJvcjogdW5rbm93biB0eXBlIG5hbWUg4oCYcG1kX3TigJkK PiAgc3RhdGljIGlubGluZSBpbnQgcG1kX3NvZnRfZGlydHkocG1kX3QgcG1kKQo+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBeCgouLi4KCj4gc2NyaXB0cy9NYWtlZmlsZS5idWls ZDoyNjU6IHJlY2lwZSBmb3IgdGFyZ2V0ICdpbml0L21haW4ubycgZmFpbGVkCj4gbWFrZVsxXTog KioqIFtpbml0L21haW4ub10gRXJyb3IgMQo+IE1ha2VmaWxlOjE2NDk6IHJlY2lwZSBmb3IgdGFy Z2V0ICdpbml0JyBmYWlsZWQKPiBtYWtlOiAqKiogW2luaXRdIEVycm9yIDIKClRoZSBodW5rIGJl bG93IGZpeGVzIHRoZSBidWlsZC4KCmRpZmYgLS1naXQgYS9hcmNoL202OGsvaW5jbHVkZS9hc20v cGFnZS5oIGIvYXJjaC9tNjhrL2luY2x1ZGUvYXNtL3BhZ2UuaAppbmRleCBjMDBiNjdhLi4wNWUx ZTFlIDEwMDY0NAotLS0gYS9hcmNoL202OGsvaW5jbHVkZS9hc20vcGFnZS5oCisrKyBiL2FyY2gv bTY4ay9pbmNsdWRlL2FzbS9wYWdlLmgKQEAgLTIxLDcgKzIxLDcgQEAKIC8qCiAgKiBUaGVzZSBh cmUgdXNlZCB0byBtYWtlIHVzZSBvZiBDIHR5cGUtY2hlY2tpbmcuLgogICovCi0jaWYgQ09ORklH X1BHVEFCTEVfTEVWRUxTID09IDMKKyNpZiAhZGVmaW5lZChDT05GSUdfTU1VKSB8fCBDT05GSUdf UEdUQUJMRV9MRVZFTFMgPT0gMwogdHlwZWRlZiBzdHJ1Y3QgeyB1bnNpZ25lZCBsb25nIHBtZFsx Nl07IH0gcG1kX3Q7CiAjZGVmaW5lIHBtZF92YWwoeCkJKCgmeCktPnBtZFswXSkKICNkZWZpbmUg X19wbWQoeCkJKChwbWRfdCkgeyB7ICh4KSB9LCB9KQogCj4gUmVnYXJkcwo+IEdyZWcKPiAKCi0t IApTaW5jZXJlbHkgeW91cnMsCk1pa2UuCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 24 Oct 2019 08:35:34 +0300 From: Mike Rapoport Subject: Re: [PATCH 04/12] m68k: nommu: use pgtable-nopud instead of 4level-fixup Message-ID: <20191024053533.GA12281@rapoport-lnx> References: <1571822941-29776-1-git-send-email-rppt@kernel.org> <1571822941-29776-5-git-send-email-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: To: Greg Ungerer Cc: linux-mm@kvack.org, 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 List-ID: Message-ID: <20191024053534.B3Ymj8R7SG1ycX6CFW-EnyE7LJj-c-ELIioRPN_apNw@z> Hi Greg, On Thu, Oct 24, 2019 at 02:09:01PM +1000, Greg Ungerer wrote: > Hi Mike, > > On 23/10/19 7:28 pm, Mike Rapoport wrote: > >From: Mike Rapoport > > > >The generic nommu implementation of page table manipulation takes care of > >folding of the upper levels and does not require fixups. > > > >Simply replace of include/asm-generic/4level-fixup.h with > >include/asm-generic/pgtable-nopud.h. > > > >Signed-off-by: Mike Rapoport > >--- > > arch/m68k/include/asm/pgtable_no.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >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 > >-#include > >+#include > > /* > > * (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 ‘pmd_t’ > static inline int pmd_soft_dirty(pmd_t pmd) > ^ ... > 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 The hunk below fixes the build. diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h index c00b67a..05e1e1e 100644 --- a/arch/m68k/include/asm/page.h +++ b/arch/m68k/include/asm/page.h @@ -21,7 +21,7 @@ /* * These are used to make use of C type-checking.. */ -#if CONFIG_PGTABLE_LEVELS == 3 +#if !defined(CONFIG_MMU) || CONFIG_PGTABLE_LEVELS == 3 typedef struct { unsigned long pmd[16]; } pmd_t; #define pmd_val(x) ((&x)->pmd[0]) #define __pmd(x) ((pmd_t) { { (x) }, }) > Regards > Greg > -- Sincerely yours, Mike.