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 /include/asm-powerpc/page.h | |
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 'include/asm-powerpc/page.h')
-rw-r--r-- | include/asm-powerpc/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index b4d38b0b15f8..f37bff0ee889 100644 --- a/include/asm-powerpc/page.h +++ b/include/asm-powerpc/page.h | |||
@@ -126,7 +126,7 @@ typedef struct { unsigned long pmd; } pmd_t; | |||
126 | #define __pmd(x) ((pmd_t) { (x) }) | 126 | #define __pmd(x) ((pmd_t) { (x) }) |
127 | 127 | ||
128 | /* PUD level exusts only on 4k pages */ | 128 | /* PUD level exusts only on 4k pages */ |
129 | #ifndef CONFIG_PPC_64K_PAGES | 129 | #if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_64K_PAGES) |
130 | typedef struct { unsigned long pud; } pud_t; | 130 | typedef struct { unsigned long pud; } pud_t; |
131 | #define pud_val(x) ((x).pud) | 131 | #define pud_val(x) ((x).pud) |
132 | #define __pud(x) ((pud_t) { (x) }) | 132 | #define __pud(x) ((pud_t) { (x) }) |