Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34
b: refs/heads/master
c: a85f6d4
h: refs/heads/master
v: v3
  • Loading branch information
Kumar Gala authored and Linus Torvalds committed Apr 16, 2005
1 parent c313424 commit 217ce17
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7a1e335085ead05da08f791340f58b493126894d
refs/heads/master: a85f6d4aca822acdb49d27c44519cd6514b06a1d
10 changes: 5 additions & 5 deletions trunk/arch/ppc/mm/pgtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
#define p_mapped_by_tlbcam(x) (0UL)
#endif /* HAVE_TLBCAM */

#ifdef CONFIG_44x
#ifdef CONFIG_PTE_64BIT
/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
#define PGDIR_ORDER 1
#else
Expand Down Expand Up @@ -142,13 +142,13 @@ void pte_free(struct page *ptepage)
__free_page(ptepage);
}

#ifndef CONFIG_44x
#ifndef CONFIG_PHYS_64BIT
void __iomem *
ioremap(phys_addr_t addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
#else /* CONFIG_44x */
#else /* CONFIG_PHYS_64BIT */
void __iomem *
ioremap64(unsigned long long addr, unsigned long size)
{
Expand All @@ -162,7 +162,7 @@ ioremap(phys_addr_t addr, unsigned long size)

return ioremap64(addr64, size);
}
#endif /* CONFIG_44x */
#endif /* CONFIG_PHYS_64BIT */

void __iomem *
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
Expand Down Expand Up @@ -193,7 +193,7 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
*/
if ( mem_init_done && (p < virt_to_phys(high_memory)) )
{
printk("__ioremap(): phys addr "PTE_FMT" is RAM lr %p\n", p,
printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
__builtin_return_address(0));
return NULL;
}
Expand Down
4 changes: 3 additions & 1 deletion trunk/include/asm-ppc/mmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
* virtual/physical addressing like 32-bit virtual / 36-bit
* physical need a larger than native word size type. -Matt
*/
#ifndef CONFIG_PTE_64BIT
#ifndef CONFIG_PHYS_64BIT
typedef unsigned long phys_addr_t;
#define PHYS_FMT "%.8lx"
#else
typedef unsigned long long phys_addr_t;
extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);
#define PHYS_FMT "%16Lx"
#endif

/* Default "unsigned long" context */
Expand Down

0 comments on commit 217ce17

Please sign in to comment.