powerpc: Further compile fixup for STRICT_MM_TYPECHECKS

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

David Gibson and committed by

Benjamin Herrenschmidt 17 years ago 201bdc86 8873d93b

+2 -1

1 changed file

expand all

arch

powerpc

kernel

pci-common.c

+2 -1

arch/powerpc/kernel/pci-common.c

··· 610 610 pr_debug(" -> mapping phys %llx\n", (unsigned long long)offset); 611 611 612 612 vma->vm_pgoff = offset >> PAGE_SHIFT; 613 - vma->vm_page_prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; 613 + vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot) 614 + | _PAGE_NO_CACHE | _PAGE_GUARDED); 614 615 return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, 615 616 vma->vm_end - vma->vm_start, 616 617 vma->vm_page_prot);