From 8e200e7314a52a74b15c472580c100040e506b09 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 20 Oct 2008 17:55:29 +0000 Subject: [PATCH] --- yaml --- r: 116965 b: refs/heads/master c: 201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96 h: refs/heads/master i: 116963: a7bdcf2f9417e047cc2cd4af90c0cbd538607505 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cdb6bd8c8ec3..ba83796824e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8873d93b4bf0bd270c3fc7e178211633e7a1d5e8 +refs/heads/master: 201bdc868d9e3122bbe4491aa6b5fc4dee4cdb96 diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c index 3815d84a1ef4..1ec73938a00f 100644 --- a/trunk/arch/powerpc/kernel/pci-common.c +++ b/trunk/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);