From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 2/2] arm64: Correct virt_addr_valid
Date: Wed, 18 Dec 2013 18:30:54 +0000 [thread overview]
Message-ID: <20131218183054.GK28112@arm.com> (raw)
In-Reply-To: <52B1E770.9060308@codeaurora.org>
On Wed, Dec 18, 2013 at 06:20:32PM +0000, Laura Abbott wrote:
> On 12/17/2013 4:00 AM, Catalin Marinas wrote:
> > On Mon, Dec 16, 2013 at 07:01:45PM +0000, Laura Abbott wrote:
> >> diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
> >> index 3776217..b8ec776 100644
> >> --- a/arch/arm64/include/asm/memory.h
> >> +++ b/arch/arm64/include/asm/memory.h
> >> @@ -146,8 +146,9 @@ static inline void *phys_to_virt(phys_addr_t x)
> >> #define ARCH_PFN_OFFSET PHYS_PFN_OFFSET
> >>
> >> #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
> >> -#define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \
> >> - ((void *)(kaddr) < (void *)high_memory))
> >> +#define virt_addr_valid(kaddr) (pfn_valid(__pa(kaddr) >> PAGE_SHIFT) && \
> >> + ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory))
> >> +
> >
> > I still think the original patch was fine for arm64, no need for
> > additional checks since we don't have highmem and __pa() is always
> > linear.
>
> Okay, do you want to go ahead and just take the previous version then?
I already did (while Will is away ;)). Thanks.
--
Catalin
next prev parent reply other threads:[~2013-12-18 18:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 19:01 [PATCHv2 1/2] arm: Correct virt_addr_valid Laura Abbott
2013-12-16 19:01 ` [PATCHv2 2/2] arm64: " Laura Abbott
2013-12-17 12:00 ` Catalin Marinas
2013-12-18 18:20 ` Laura Abbott
2013-12-18 18:30 ` Catalin Marinas [this message]
2013-12-17 12:08 ` [PATCHv2 1/2] arm: " Will Deacon
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=20131218183054.GK28112@arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.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).