mm/early_ioremap: use offset_in_page macro

linux/mm.h provides offset_in_page() macro.  Let's use already predefined
macro instead of (addr & ~PAGE_MASK).

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexander Kuleshov 2015-11-05 18:46:40 -08:00 коммит произвёл Linus Torvalds
Родитель e7bbdd0713
Коммит 5d57b0146a
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -126,7 +126,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
/* /*
* Mappings have to be page-aligned * Mappings have to be page-aligned
*/ */
offset = phys_addr & ~PAGE_MASK; offset = offset_in_page(phys_addr);
phys_addr &= PAGE_MASK; phys_addr &= PAGE_MASK;
size = PAGE_ALIGN(last_addr + 1) - phys_addr; size = PAGE_ALIGN(last_addr + 1) - phys_addr;
@ -189,7 +189,7 @@ void __init early_iounmap(void __iomem *addr, unsigned long size)
if (WARN_ON(virt_addr < fix_to_virt(FIX_BTMAP_BEGIN))) if (WARN_ON(virt_addr < fix_to_virt(FIX_BTMAP_BEGIN)))
return; return;
offset = virt_addr & ~PAGE_MASK; offset = offset_in_page(virt_addr);
nrpages = PAGE_ALIGN(offset + size) >> PAGE_SHIFT; nrpages = PAGE_ALIGN(offset + size) >> PAGE_SHIFT;
idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot; idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
@ -234,7 +234,7 @@ void __init copy_from_early_mem(void *dest, phys_addr_t src, unsigned long size)
char *p; char *p;
while (size) { while (size) {
slop = src & ~PAGE_MASK; slop = offset_in_page(src);
clen = size; clen = size;
if (clen > MAX_MAP_CHUNK - slop) if (clen > MAX_MAP_CHUNK - slop)
clen = MAX_MAP_CHUNK - slop; clen = MAX_MAP_CHUNK - slop;