[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>
This commit is contained in:

committed by
Paul Mackerras

szülő
57d7909e0d
commit
69d48b409c
@@ -273,7 +273,8 @@ void __init ps3_map_htab(void)
|
||||
|
||||
result = lv1_map_htab(0, &htab_addr);
|
||||
|
||||
htab = (hpte_t *)__ioremap(htab_addr, htab_size, PAGE_READONLY_X);
|
||||
htab = (hpte_t *)__ioremap(htab_addr, htab_size,
|
||||
pgprot_val(PAGE_READONLY_X));
|
||||
|
||||
DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,
|
||||
htab_addr, (unsigned long)htab);
|
||||
|
Reference in New Issue
Block a user