aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/mm/pgtable.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 0a5cd20275c4..5d2f3f66aefa 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -74,7 +74,7 @@ extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
74#define p_mapped_by_tlbcam(x) (0UL) 74#define p_mapped_by_tlbcam(x) (0UL)
75#endif /* HAVE_TLBCAM */ 75#endif /* HAVE_TLBCAM */
76 76
77#ifdef CONFIG_44x 77#ifdef CONFIG_PTE_64BIT
78/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */ 78/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
79#define PGDIR_ORDER 1 79#define PGDIR_ORDER 1
80#else 80#else
@@ -142,13 +142,13 @@ void pte_free(struct page *ptepage)
142 __free_page(ptepage); 142 __free_page(ptepage);
143} 143}
144 144
145#ifndef CONFIG_44x 145#ifndef CONFIG_PHYS_64BIT
146void __iomem * 146void __iomem *
147ioremap(phys_addr_t addr, unsigned long size) 147ioremap(phys_addr_t addr, unsigned long size)
148{ 148{
149 return __ioremap(addr, size, _PAGE_NO_CACHE); 149 return __ioremap(addr, size, _PAGE_NO_CACHE);
150} 150}
151#else /* CONFIG_44x */ 151#else /* CONFIG_PHYS_64BIT */
152void __iomem * 152void __iomem *
153ioremap64(unsigned long long addr, unsigned long size) 153ioremap64(unsigned long long addr, unsigned long size)
154{ 154{
@@ -162,7 +162,7 @@ ioremap(phys_addr_t addr, unsigned long size)
162 162
163 return ioremap64(addr64, size); 163 return ioremap64(addr64, size);
164} 164}
165#endif /* CONFIG_44x */ 165#endif /* CONFIG_PHYS_64BIT */
166 166
167void __iomem * 167void __iomem *
168__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) 168__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@@ -193,7 +193,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
193 */ 193 */
194 if ( mem_init_done && (p < virt_to_phys(high_memory)) ) 194 if ( mem_init_done && (p < virt_to_phys(high_memory)) )
195 { 195 {
196 printk("__ioremap(): phys addr "PTE_FMT" is RAM lr %p\n", p, 196 printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
197 __builtin_return_address(0)); 197 __builtin_return_address(0));
198 return NULL; 198 return NULL;
199 } 199 }