From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Will Deacon <will@kernel.org>, Mike Rapoport <rppt@linux.ibm.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm64 tree
Date: Mon, 21 Sep 2020 09:12:28 +0100 [thread overview]
Message-ID: <20200921081228.GA13882@gaia> (raw)
In-Reply-To: <20200921180353.421484e8@canb.auug.org.au>
On Mon, Sep 21, 2020 at 06:03:53PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index 087a844b4d26,64211436629d..000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp
> #endif
>
> /* map all the memory banks */
> - for_each_memblock(memory, reg) {
> - phys_addr_t start = reg->base;
> - phys_addr_t end = start + reg->size;
> -
> + for_each_mem_range(i, &start, &end) {
> if (start >= end)
> break;
> - if (memblock_is_nomap(reg))
> - continue;
> -
> - __map_memblock(pgdp, start, end, PAGE_KERNEL, flags);
> + /*
> + * The linear map must allow allocation tags reading/writing
> + * if MTE is present. Otherwise, it has the same attributes as
> + * PAGE_KERNEL.
> + */
> + __map_memblock(pgdp, start, end, PAGE_KERNEL_TAGGED, flags);
> }
It looks fine. Thanks Stephen.
--
Catalin
next prev parent reply other threads:[~2020-09-21 8:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 8:03 linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2020-09-21 8:12 ` Catalin Marinas [this message]
2020-10-13 7:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-10-08 6:04 Stephen Rothwell
2021-10-08 7:37 ` Will Deacon
2021-04-13 8:59 Stephen Rothwell
2021-04-13 9:14 ` Catalin Marinas
2020-12-03 8:06 Stephen Rothwell
2020-12-03 11:16 ` Catalin Marinas
2020-07-16 8:00 Stephen Rothwell
2020-07-16 8:23 ` Will Deacon
2020-04-30 6:26 Stephen Rothwell
2020-04-29 6:53 Stephen Rothwell
2019-08-07 6:39 Stephen Rothwell
2018-12-13 6:01 Stephen Rothwell
2018-12-13 11:12 ` Will Deacon
2018-12-11 6:11 linux-next: manual merge of the akpm-current tree with the FIXME tree Stephen Rothwell
2018-12-11 6:12 ` linux-next: manual merge of the akpm-current tree with the arm64 tree Stephen Rothwell
2018-12-11 10:39 ` Will Deacon
2018-12-11 6:02 Stephen Rothwell
2018-09-24 4:38 Stephen Rothwell
2018-09-24 9:32 ` Catalin Marinas
2018-07-27 10:55 Stephen Rothwell
2018-08-16 0:11 ` Stephen Rothwell
2017-11-06 5:33 Stephen Rothwell
2016-09-27 6:03 Stephen Rothwell
2016-06-22 4:54 Stephen Rothwell
2015-12-16 5:01 Stephen Rothwell
2015-12-16 10:14 ` Will Deacon
2014-09-23 7:23 Stephen Rothwell
2014-09-23 8:36 ` Catalin Marinas
2014-07-24 8:42 Stephen Rothwell
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=20200921081228.GA13882@gaia \
--to=catalin.marinas@arm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).