From: David Gibson Date: Mon, 20 Oct 2008 17:55:29 +0000 (+0000) Subject: powerpc: Further compile fixup for STRICT_MM_TYPECHECKS X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96;p=openwrt%2Fstaging%2Fblogic.git powerpc: Further compile fixup for STRICT_MM_TYPECHECKS 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 Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 3815d84a1ef4..1ec73938a00f 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -610,7 +610,8 @@ int pci_mmap_legacy_page_range(struct pci_bus *bus, 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);