diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/efi.c | 2 | ||||
-rw-r--r-- | arch/ia64/pci/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index b13c0555c3ba..e4bfa9dafbce 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c | |||
@@ -759,7 +759,7 @@ valid_phys_addr_range (unsigned long phys_addr, unsigned long size) | |||
759 | } | 759 | } |
760 | 760 | ||
761 | int | 761 | int |
762 | valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long size) | 762 | valid_mmap_phys_addr_range (unsigned long pfn, unsigned long size) |
763 | { | 763 | { |
764 | /* | 764 | /* |
765 | * MMIO regions are often missing from the EFI memory map. | 765 | * MMIO regions are often missing from the EFI memory map. |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 276512fd8922..60b45e79f080 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -650,7 +650,7 @@ pci_mmap_legacy_page_range(struct pci_bus *bus, struct vm_area_struct *vma) | |||
650 | * Avoid attribute aliasing. See Documentation/ia64/aliasing.txt | 650 | * Avoid attribute aliasing. See Documentation/ia64/aliasing.txt |
651 | * for more details. | 651 | * for more details. |
652 | */ | 652 | */ |
653 | if (!valid_mmap_phys_addr_range(vma->vm_pgoff << PAGE_SHIFT, size)) | 653 | if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size)) |
654 | return -EINVAL; | 654 | return -EINVAL; |
655 | prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size, | 655 | prot = phys_mem_access_prot(NULL, vma->vm_pgoff, size, |
656 | vma->vm_page_prot); | 656 | vma->vm_page_prot); |