dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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:
David Gibson 2007-04-30 15:37:06 +10:00 committed by Paul Mackerras
parent 57d7909e0d
commit 69d48b409c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/pci_32.c
View File

@ -1658,7 +1658,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
int i;
if (page_is_ram(pfn))
return prot;
return __pgprot(prot);
prot |= _PAGE_NO_CACHE | _PAGE_GUARDED;

3
arch/powerpc/platforms/ps3/htab.c
View File

@ -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);

2
arch/powerpc/platforms/ps3/spu.c
View File

@ -184,7 +184,7 @@ static int __init setup_areas(struct spu *spu)
spu_pdata(spu)->shadow = __ioremap(
spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
PAGE_READONLY | _PAGE_NO_CACHE | _PAGE_GUARDED);
pgprot_val(PAGE_READONLY) | _PAGE_NO_CACHE | _PAGE_GUARDED);
if (!spu_pdata(spu)->shadow) {
pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
goto fail_ioremap;

2
include/asm-powerpc/page.h
View File

@ -126,7 +126,7 @@ typedef struct { unsigned long pmd; } pmd_t;
#define __pmd(x) ((pmd_t) { (x) })
/* PUD level exusts only on 4k pages */
#ifndef CONFIG_PPC_64K_PAGES
#if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_64K_PAGES)
typedef struct { unsigned long pud; } pud_t;
#define pud_val(x) ((x).pud)
#define __pud(x) ((pud_t) { (x) })