Commit:     bc63818931ea55c54d6e59b7d38bff8f295dc8c1
Parent:     83af919e0f239e87bc644a2c932b9cebf5771380
Author:     Jochen Friedrich <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 24 19:14:57 2007 +0200
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Fri Sep 28 10:25:32 2007 -0500

    [PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
    cpm_dpram_addr returns physical memory of the DP RAM instead of
    iomapped virtual memory. As there usually is a 1:1 MMU map of
    the IMMR area, this is often not noticed. However, cpm_dpram_phys
    assumes this iomapped virtual memory and returns garbage on the
    1:1 mapped memory causing CPM1 uart console to fail.
    This patch fixes the problem (copied from the powerpc tree).
    Signed-off-by: Jochen Friedrich <[EMAIL PROTECTED]>
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
 arch/ppc/8xx_io/commproc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 7088428..9da880b 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
 void *cpm_dpram_addr(unsigned long offset)
-       return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset;
+       return (void *)(dpram_vbase + offset);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to