OMAP4:GCXXX: Fixing build warnings

Next build warnings are fixed:

drivers/misc/gcx/gccore/gcmain.c: In function 'gc_map':
drivers/misc/gcx/gccore/gcmain.c:690: warning: assignment from incompatible pointer type
drivers/misc/gcx/gccore/gcmmu.c: In function 'virt2phys':
drivers/misc/gcx/gccore/gcmmu.c:255: warning: passing argument 1 of 'pmd_offset' from incompatible pointer type
omap/arch/arm/include/asm/pgtable-2level.h:156: note: expected 'struct pud_t *' but argument is of type 'pmdval_t (*)[2]'

Change-Id: Ifd90c99f248fe66e0cfe887a4ec535b07637adef
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Pradeep Venkatasubbarao <pradeepv@ti.com>

diff --git a/drivers/misc/gcx/gccore/gcmain.c b/drivers/misc/gcx/gccore/gcmain.c
index 0e9d4b8f8ec5b4ac59364726f3be8f64ce5d18a1..26939ed0e0ddac5d942cb8021bf0f5ce7ee6c56c 100644 (file)
--- a/drivers/misc/gcx/gccore/gcmain.c
+++ b/drivers/misc/gcx/gccore/gcmain.c
@@ -687,7 +687,7 @@ void gc_map(struct gcimap *gcimap, bool fromuser)
        } else {
                mem.base = 0;
                mem.offset = gcimap->buf.offset;
-               mem.pages = gcimap->pagearray;
+               mem.pages = (pte_t *)gcimap->pagearray;
 
                GCDBG(GCZONE_MAPPING, "  pagearray = 0x%08X\n",
                      (unsigned int) gcimap->pagearray);

diff --git a/drivers/misc/gcx/gccore/gcmmu.c b/drivers/misc/gcx/gccore/gcmmu.c
index 42e68e465333c7bc43e99be501755794c5d5cf1f..31a873a09ac1abeb487ee244eec9563f344a05e4 100644 (file)
--- a/drivers/misc/gcx/gccore/gcmmu.c
+++ b/drivers/misc/gcx/gccore/gcmmu.c
@@ -252,7 +252,7 @@ static enum gcerror virt2phys(unsigned int logical, pte_t *physical)
                return GCERR_MMU_PAGE_BAD;
 
        /* Get the pointer to the entry in PMD for the address. */
-       pmd = pmd_offset(pgd, logical);
+       pmd = pmd_offset((pud_t *)pgd, logical);
        if (pmd_none(*pmd) || pmd_bad(*pmd))
                return GCERR_MMU_PAGE_BAD;