Skip to content

Commit

Permalink
sparc32: drop superfluous cast in calls to __nocache_pa()
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
sravnborg authored and davem330 committed May 21, 2016
1 parent 6e6e418 commit 6b1cabe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/sparc/include/asm/pgalloc_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static inline void free_pgd_fast(pgd_t *pgd)

static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
{
unsigned long pa = __nocache_pa((unsigned long)pmdp);
unsigned long pa = __nocache_pa(pmdp);

set_pte((pte_t *)pgdp, __pte((SRMMU_ET_PTD | (pa >> 4))));
}
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/mm/srmmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void pmd_set(pmd_t *pmdp, pte_t *ptep)
unsigned long ptp; /* Physical address, shifted right by 4 */
int i;

ptp = __nocache_pa((unsigned long) ptep) >> 4;
ptp = __nocache_pa(ptep) >> 4;
for (i = 0; i < PTRS_PER_PTE/SRMMU_REAL_PTRS_PER_PTE; i++) {
set_pte((pte_t *)&pmdp->pmdv[i], __pte(SRMMU_ET_PTD | ptp));
ptp += (SRMMU_REAL_PTRS_PER_PTE * sizeof(pte_t) >> 4);
Expand Down Expand Up @@ -916,7 +916,7 @@ void __init srmmu_paging_init(void)

/* ctx table has to be physically aligned to its size */
srmmu_context_table = __srmmu_get_nocache(num_contexts * sizeof(ctxd_t), num_contexts * sizeof(ctxd_t));
srmmu_ctx_table_phys = (ctxd_t *)__nocache_pa((unsigned long)srmmu_context_table);
srmmu_ctx_table_phys = (ctxd_t *)__nocache_pa(srmmu_context_table);

for (i = 0; i < num_contexts; i++)
srmmu_ctxd_set((ctxd_t *)__nocache_fix(&srmmu_context_table[i]), srmmu_swapper_pg_dir);
Expand Down

0 comments on commit 6b1cabe

Please sign in to comment.