| From 6c24b17453c8dc444a746e45b8a404498fc9fcf7 Mon Sep 17 00:00:00 2001 |
| From: Kumar Gala <galak@kernel.crashing.org> |
| Date: Mon, 9 Feb 2009 21:08:07 -0600 |
| Subject: powerpc/fsl-booke: Fix mapping functions to use phys_addr_t |
| |
| From: Kumar Gala <galak@kernel.crashing.org> |
| |
| commit 6c24b17453c8dc444a746e45b8a404498fc9fcf7 upstream. |
| |
| Fixed v_mapped_by_tlbcam() and p_mapped_by_tlbcam() to use phys_addr_t |
| instead of unsigned long. In 36-bit physical mode we really need these |
| functions to deal with phys_addr_t when trying to match a physical |
| address or when returning one. |
| |
| Signed-off-by: Kumar Gala <galak@kernel.crashing.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/powerpc/mm/fsl_booke_mmu.c | 4 ++-- |
| arch/powerpc/mm/pgtable_32.c | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/arch/powerpc/mm/fsl_booke_mmu.c |
| +++ b/arch/powerpc/mm/fsl_booke_mmu.c |
| @@ -80,7 +80,7 @@ extern unsigned int tlbcam_index; |
| /* |
| * Return PA for this VA if it is mapped by a CAM, or 0 |
| */ |
| -unsigned long v_mapped_by_tlbcam(unsigned long va) |
| +phys_addr_t v_mapped_by_tlbcam(unsigned long va) |
| { |
| int b; |
| for (b = 0; b < tlbcam_index; ++b) |
| @@ -92,7 +92,7 @@ unsigned long v_mapped_by_tlbcam(unsigne |
| /* |
| * Return VA for a given PA or 0 if not mapped |
| */ |
| -unsigned long p_mapped_by_tlbcam(unsigned long pa) |
| +unsigned long p_mapped_by_tlbcam(phys_addr_t pa) |
| { |
| int b; |
| for (b = 0; b < tlbcam_index; ++b) |
| --- a/arch/powerpc/mm/pgtable_32.c |
| +++ b/arch/powerpc/mm/pgtable_32.c |
| @@ -65,8 +65,8 @@ void setbat(int index, unsigned long vir |
| |
| #ifdef HAVE_TLBCAM |
| extern unsigned int tlbcam_index; |
| -extern unsigned long v_mapped_by_tlbcam(unsigned long va); |
| -extern unsigned long p_mapped_by_tlbcam(unsigned long pa); |
| +extern phys_addr_t v_mapped_by_tlbcam(unsigned long va); |
| +extern unsigned long p_mapped_by_tlbcam(phys_addr_t pa); |
| #else /* !HAVE_TLBCAM */ |
| #define v_mapped_by_tlbcam(x) (0UL) |
| #define p_mapped_by_tlbcam(x) (0UL) |