diff options
| author | Florian Zumbiehl <florz@florz.de> | 2010-08-11 14:17:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 08:43:29 -0700 |
| commit | a292dfa01794477126d3f022559eb235edde00b0 (patch) | |
| tree | abc2ca6ec588491e07940ce674b4bac71571d8d7 | |
| parent | 17e465034a174d23e08cbb964aeda5e41e5d84ca (diff) | |
| download | blackbird-obmc-linux-a292dfa01794477126d3f022559eb235edde00b0.tar.gz blackbird-obmc-linux-a292dfa01794477126d3f022559eb235edde00b0.zip | |
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>
| -rw-r--r-- | arch/parisc/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 92d496ad07c9..838d0259cd27 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -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.. |
