Messages in this thread | | | Date | Tue, 22 Nov 2011 08:13:17 +0000 | From | Russell King <> | Subject | Re: linux-next: manual merge of the arm-lpae tree with the arm tree |
| |
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:
| |