diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-04-30 01:37:06 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-02 06:04:30 -0400 |
commit | 69d48b409cac747cc0707b05b769e38488a6ad35 (patch) | |
tree | 0db8868c915c1ae2035682d6ca138438d6996c6f /arch/powerpc/kernel/pci_32.c | |
parent | 57d7909e0d2dd54567ae775e22b14076b777042a (diff) |
[POWERPC] Fix STRICT_MM_TYPECHECKS
Since we don't have it active by default, the STRICT_MM_TYPECHECKS
option has bitrotted again. This patch fixes a couple of simple build
fixes if the option is selected. First, pud_t mustn't be defined in
page.h on 32-bit systems, because it conflicts with the version in the
generic pud-folding code. Second, pci_32.c is missing a __pgprot()
wrapper call. Third, a couple of PS3 files use constants of type
pgprot_t when they need the raw values, we add pgprot_val() calls to
fix this.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index f022862de344..e66064b5093a 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -1658,7 +1658,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, | |||
1658 | int i; | 1658 | int i; |
1659 | 1659 | ||
1660 | if (page_is_ram(pfn)) | 1660 | if (page_is_ram(pfn)) |
1661 | return prot; | 1661 | return __pgprot(prot); |
1662 | 1662 | ||
1663 | prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; | 1663 | prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; |
1664 | 1664 | ||