aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/mm-armv.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/mm-armv.c')
-rw-r--r--arch/arm/mm/mm-armv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index c626361c0f5e..64db10e806b3 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -483,7 +483,7 @@ void __init create_mapping(struct map_desc *md)
483 if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) { 483 if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) {
484 printk(KERN_WARNING "BUG: not creating mapping for " 484 printk(KERN_WARNING "BUG: not creating mapping for "
485 "0x%08lx at 0x%08lx in user region\n", 485 "0x%08lx at 0x%08lx in user region\n",
486 md->physical, md->virtual); 486 __pfn_to_phys(md->pfn), md->virtual);
487 return; 487 return;
488 } 488 }
489 489
@@ -491,7 +491,7 @@ void __init create_mapping(struct map_desc *md)
491 md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) { 491 md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) {
492 printk(KERN_WARNING "BUG: mapping for 0x%08lx at 0x%08lx " 492 printk(KERN_WARNING "BUG: mapping for 0x%08lx at 0x%08lx "
493 "overlaps vmalloc space\n", 493 "overlaps vmalloc space\n",
494 md->physical, md->virtual); 494 __pfn_to_phys(md->pfn), md->virtual);
495 } 495 }
496 496
497 domain = mem_types[md->type].domain; 497 domain = mem_types[md->type].domain;
@@ -500,14 +500,14 @@ void __init create_mapping(struct map_desc *md)
500 prot_sect = mem_types[md->type].prot_sect | PMD_DOMAIN(domain); 500 prot_sect = mem_types[md->type].prot_sect | PMD_DOMAIN(domain);
501 501
502 virt = md->virtual; 502 virt = md->virtual;
503 off = md->physical - virt; 503 off = __pfn_to_phys(md->pfn) - virt;
504 length = md->length; 504 length = md->length;
505 505
506 if (mem_types[md->type].prot_l1 == 0 && 506 if (mem_types[md->type].prot_l1 == 0 &&
507 (virt & 0xfffff || (virt + off) & 0xfffff || (virt + length) & 0xfffff)) { 507 (virt & 0xfffff || (virt + off) & 0xfffff || (virt + length) & 0xfffff)) {
508 printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not " 508 printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not "
509 "be mapped using pages, ignoring.\n", 509 "be mapped using pages, ignoring.\n",
510 md->physical, md->virtual); 510 __pfn_to_phys(md->pfn), md->virtual);
511 return; 511 return;
512 } 512 }
513 513