From: Greg Ungerer <gerg@linux-m68k•org>
To: Mike Rapoport <rppt@kernel•org>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership•com>,
linux-mm@kvack•org, sparclinux@vger•kernel.org,
Vincent Chen <deanbo422@gmail•com>,
Anton Ivanov <anton.ivanov@cambridgegreys•com>,
linux-arch@vger•kernel.org, linux-c6x-dev@linux-c6x•org,
Richard Weinberger <richard@nod•at>, Helge Deller <deller@gmx•de>,
Russell King <linux@armlinux•org.uk>,
Mike Rapoport <rppt@linux•ibm.com>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Mark Salter <msalter@redhat•com>,
Matt Turner <mattst88@gmail•com>, Jeff Dike <jdike@addtoit•com>,
Sam Creasey <sammy@sammy•net>, Arnd Bergmann <arnd@arndb•de>,
Vineet Gupta <Vineet.Gupta1@synopsys•com>,
linux-um@lists•infradead.org, linux-m68k@lists•linux-m68k.org,
Greentime Hu <green.hu@gmail•com>,
"Kirill A. Shutemov" <kirill@shutemov•name>,
linux-arm-kernel@lists•infradead.org,
Michal Simek <monstr@monstr•eu>,
linux-parisc@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-alpha@vger•kernel.org,
Andrew Morton <akpm@linux-foundation•org>,
Linus Torvalds <torvalds@linux-foundation•org>,
"David S. Miller" <davem@davemloft•net>
Subject: Re: [PATCH 04/12] m68k: nommu: use pgtable-nopud instead of 4level-fixup
Date: Thu, 24 Oct 2019 16:23:04 +1000 [thread overview]
Message-ID: <24454c38-184a-b5fe-e534-aad3713c157e@linux-m68k.org> (raw)
In-Reply-To: <20191024053533.GA12281@rapoport-lnx>
Hi Mike,
On 24/10/19 3:35 pm, Mike Rapoport wrote:
> 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 <rppt@linux•ibm.com>
>>>
>>> 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 <rppt@linux•ibm.com>
>>> ---
>>> 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 <asm-generic/4level-fixup.h>
>>> +#include <asm-generic/pgtable-nopud.h>
>>> /*
>>> * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear•com>
>>
>> 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) }, })
That looks better. Thanks.
Tested and working on m68knommu. For the combined patches:
Acked-by: Greg Ungerer <gerg@linux-m68k•org>
Regards
Greg
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-24 6:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 9:28 [PATCH 00/12] mm: remove __ARCH_HAS_4LEVEL_HACK Mike Rapoport
2019-10-23 9:28 ` [PATCH 01/12] alpha: use pgtable-nop4d instead of 4level-fixup Mike Rapoport
2019-10-23 9:28 ` [PATCH 02/12] arm: nommu: use pgtable-nopud " Mike Rapoport
2019-10-23 9:40 ` Russell King - ARM Linux admin
2019-10-23 9:28 ` [PATCH 03/12] c6x: " Mike Rapoport
2019-10-23 9:28 ` [PATCH 04/12] m68k: nommu: " Mike Rapoport
2019-10-24 4:09 ` Greg Ungerer
2019-10-24 5:35 ` Mike Rapoport
2019-10-24 6:23 ` Greg Ungerer [this message]
2019-10-23 9:28 ` [PATCH 05/12] m68k: mm: use pgtable-nopXd " Mike Rapoport
2019-10-24 4:12 ` Greg Ungerer
2019-10-25 5:52 ` kbuild test robot
2019-10-23 9:28 ` [PATCH 06/12] microblaze: use pgtable-nopmd " Mike Rapoport
2019-10-25 2:17 ` kbuild test robot
2019-10-25 8:24 ` Michal Simek
2019-10-25 20:33 ` Mike Rapoport
2019-10-23 9:28 ` [PATCH 07/12] nds32: " Mike Rapoport
2019-10-23 9:28 ` [PATCH 08/12] parisc: use pgtable-nopXd " Mike Rapoport
2019-10-23 10:20 ` Rolf Eike Beer
2019-10-24 8:51 ` Mike Rapoport
2019-10-24 9:35 ` Peter Rosin
2019-10-24 9:50 ` Mike Rapoport
2019-10-23 9:28 ` [PATCH 09/12] sparc32: use pgtable-nopud " Mike Rapoport
2019-10-23 19:59 ` [PATCH v2 " Mike Rapoport
2019-10-23 21:21 ` David Miller
2019-10-23 9:28 ` [PATCH 10/12] um: remove unused pxx_offset_proc() and addr_pte() functions Mike Rapoport
2019-10-23 9:29 ` [PATCH 11/12] um: add support for folded p4d page tables Mike Rapoport
2019-10-23 9:29 ` [PATCH 12/12] mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h Mike Rapoport
2019-10-23 10:25 ` [PATCH 00/12] mm: remove __ARCH_HAS_4LEVEL_HACK Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=24454c38-184a-b5fe-e534-aad3713c157e@linux-m68k.org \
--to=gerg@linux-m68k$(echo .)org \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=Vineet.Gupta1@synopsys$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anton.ivanov@cambridgegreys$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=deanbo422@gmail$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=geert@linux-m68k$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=jdike@addtoit$(echo .)com \
--cc=kirill@shutemov$(echo .)name \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-c6x-dev@linux-c6x$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=mattst88@gmail$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=msalter@redhat$(echo .)com \
--cc=richard@nod$(echo .)at \
--cc=rppt@kernel$(echo .)org \
--cc=rppt@linux$(echo .)ibm.com \
--cc=sammy@sammy$(echo .)net \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox