Message ID | 20081021035529.GA4358@yookeroo.seuss (mailing list archive) |
---|---|
State | Accepted, archived |
Commit | 201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96 |
Delegated to: | Benjamin Herrenschmidt |
Headers | show |
Index: working-2.6/arch/powerpc/kernel/pci-common.c =================================================================== --- working-2.6.orig/arch/powerpc/kernel/pci-common.c 2008-10-21 13:53:29.000000000 +1100 +++ working-2.6/arch/powerpc/kernel/pci-common.c 2008-10-21 13:53:52.000000000 +1100 @@ -610,7 +610,8 @@ int pci_mmap_legacy_page_range(struct pc pr_debug(" -> mapping phys %llx\n", (unsigned long long)offset); vma->vm_pgoff = offset >> PAGE_SHIFT; - vma->vm_page_prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; + vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot) + | _PAGE_NO_CACHE | _PAGE_GUARDED); return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, vma->vm_end - vma->vm_start, vma->vm_page_prot);
A patch of mine was recently committed to fix up STRICT_MM_TYPECHECKS behaviour on powerpc (f5ea64dcbad89875d130596df14c9b25d994a737). However, something which breaks it again seems to have slipped in afterwards. So, here's another small fix. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>