[tip:x86/mm] x86, iomap: Fix wrong page aligned size calculation in ioremapping code
in [Kernel]
|
Prev: [git pull] drm fixes
Next: [PATCH] Staging: dt3155: Remove copy_to_user for ioctl's DT3155_{STOP|START}
From: tip-bot for Florian Zumbiehl on 20 Jul 2010 20:50 Commit-ID: 468c30f2bbdf1ba0fbf16667eade23a46eaa8f06 Gitweb: http://git.kernel.org/tip/468c30f2bbdf1ba0fbf16667eade23a46eaa8f06 Author: Florian Zumbiehl <florz(a)florz.de> AuthorDate: Tue, 20 Jul 2010 15:19:47 -0700 Committer: H. Peter Anvin <hpa(a)linux.intel.com> CommitDate: Tue, 20 Jul 2010 16:56:35 -0700 x86, iomap: Fix wrong page aligned size calculation in ioremapping code x86 early_iounmap(): fix off-by-one error in page alignment of allocation size for sizes where size%PAGE_SIZE==1. Signed-off-by: Florian Zumbiehl <florz(a)florz.de> LKML-Reference: <201007202219.o6KMJlES021058(a)imap1.linux-foundation.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com> --- arch/x86/mm/ioremap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index d41d3a9..3ba6e06 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -611,7 +611,7 @@ void __init early_iounmap(void __iomem *addr, unsigned long size) return; } offset = virt_addr & ~PAGE_MASK; - nrpages = PAGE_ALIGN(offset + size - 1) >> PAGE_SHIFT; + nrpages = PAGE_ALIGN(offset + size) >> PAGE_SHIFT; idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot; while (nrpages > 0) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |