From: Russell King <rmk@arm•linux.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Nicolas Pitre <nicolas.pitre@linaro•org>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree
Date: Tue, 22 Nov 2011 08:13:17 +0000 [thread overview]
Message-ID: <20111122081317.GB22232@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
On Tue, Nov 22, 2011 at 12:03:58PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm/mm/ioremap.c
> index 12c7ad2,d1f78ba..0000000
> --- a/arch/arm/mm/ioremap.c
> +++ b/arch/arm/mm/ioremap.c
> @@@ -194,7 -208,14 +202,8 @@@ void __iomem * __arm_ioremap_pfn_caller
> */
> if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
> return NULL;
> + #endif
>
> - /*
> - * Don't allow RAM to be mapped - this causes problems with ARMv6+
> - */
> - if (WARN_ON(pfn_valid(pfn)))
> - return NULL;
> -
This certainly is not correct - if Catalin's lpae tree is removing this
then that needs to be fixed.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2011-11-22 8:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 1:03 linux-next: manual merge of the arm-lpae tree with the arm tree Stephen Rothwell
2011-11-22 8:13 ` Russell King [this message]
2011-11-22 9:58 ` Catalin Marinas
2011-11-22 9:47 ` Catalin Marinas
2011-11-22 11:05 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2011-12-08 0:00 Stephen Rothwell
2011-12-09 10:36 ` Catalin Marinas
2011-12-09 11:11 ` Stephen Rothwell
2011-09-12 1:15 Stephen Rothwell
2011-07-07 1:14 Stephen Rothwell
2011-06-17 0:26 Stephen Rothwell
2011-06-17 10:17 ` Catalin Marinas
2011-06-10 0:52 Stephen Rothwell
2011-06-10 14:43 ` Catalin Marinas
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=20111122081317.GB22232@flint.arm.linux.org.uk \
--to=rmk@arm$(echo .)linux.org.uk \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolas.pitre@linaro$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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