diff options
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 38ff35f2142a..22972cd83cc9 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
| @@ -266,7 +266,8 @@ int map_page(unsigned long va, phys_addr_t pa, int flags) | |||
| 266 | /* The PTE should never be already set nor present in the | 266 | /* The PTE should never be already set nor present in the |
| 267 | * hash table | 267 | * hash table |
| 268 | */ | 268 | */ |
| 269 | BUG_ON(pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE)); | 269 | BUG_ON((pte_val(*pg) & (_PAGE_PRESENT | _PAGE_HASHPTE)) && |
| 270 | flags); | ||
| 270 | set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, | 271 | set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT, |
| 271 | __pgprot(flags))); | 272 | __pgprot(flags))); |
| 272 | } | 273 | } |