Commit a292dfa0 authored Aug 11, 2010 by Florian Zumbiehl Committed by Linus Torvalds Aug 12, 2010

parisc: fix wrong page aligned size calculation in ioremapping code

parisc __ioremap(): fix off-by-one error in page alignment of allocation
size for sizes where size%PAGE_SIZE==1.

Signed-off-by: Florian Zumbiehl <florz@florz.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: Helge Deller <deller@gmx.de>
Tested-by: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 17e46503

arch/parisc/mm/ioremap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
		*/
		offset = phys_addr & ~PAGE_MASK;
		phys_addr &= PAGE_MASK;
		size = PAGE_ALIGN(last_addr) - phys_addr;
		size = PAGE_ALIGN(last_addr + 1) - phys_addr;

		/*
		* Ok, go for it..