Skip to content

Commit 8f24608

Browse files
committed
m68k: Pass a pointer to virt_to_pfn() virt_to_page()
Functions that work on a pointer to virtual memory such as virt_to_pfn() and users of that function such as virt_to_page() are supposed to pass a pointer to virtual memory, ideally a (void *) or other pointer. However since many architectures implement virt_to_pfn() as a macro, this function becomes polymorphic and accepts both a (unsigned long) and a (void *). Fix up the offending calls in arch/m68k with explicit casts. The page table include <asm/pgtable.h> will include different variants of the defines depending on whether you build for classic m68k, ColdFire or Sun3, so fix all variants. Delete Coldfire pte_pagenr() which was using unsigned long semantics from __pte_page(). Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 9b2d38b commit 8f24608

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

arch/m68k/include/asm/mcf_pgtable.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
115115
pgd_val(*pgdp) = virt_to_phys(pmdp);
116116
}
117117

118-
#define __pte_page(pte) ((unsigned long) (pte_val(pte) & PAGE_MASK))
118+
#define __pte_page(pte) ((void *) (pte_val(pte) & PAGE_MASK))
119119
#define pmd_page_vaddr(pmd) ((unsigned long) (pmd_val(pmd)))
120120

121121
static inline int pte_none(pte_t pte)
@@ -134,7 +134,6 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr,
134134
pte_val(*ptep) = 0;
135135
}
136136

137-
#define pte_pagenr(pte) ((__pte_page(pte) - PAGE_OFFSET) >> PAGE_SHIFT)
138137
#define pte_page(pte) virt_to_page(__pte_page(pte))
139138

140139
static inline int pmd_none2(pmd_t *pmd) { return !pmd_val(*pmd); }

arch/m68k/include/asm/sun3_pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
9191
#define pmd_set(pmdp,ptep) do {} while (0)
9292

9393
#define __pte_page(pte) \
94-
((unsigned long) __va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT))
94+
(__va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT))
9595

9696
static inline unsigned long pmd_page_vaddr(pmd_t pmd)
9797
{
@@ -111,7 +111,7 @@ static inline void pte_clear (struct mm_struct *mm, unsigned long addr, pte_t *p
111111

112112
#define pte_page(pte) virt_to_page(__pte_page(pte))
113113
#define pmd_pfn(pmd) (pmd_val(pmd) >> PAGE_SHIFT)
114-
#define pmd_page(pmd) virt_to_page(pmd_page_vaddr(pmd))
114+
#define pmd_page(pmd) virt_to_page((void *)pmd_page_vaddr(pmd))
115115

116116

117117
static inline int pmd_none2 (pmd_t *pmd) { return !pmd_val (*pmd); }

arch/m68k/mm/mcfmmu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ void __init paging_init(void)
6969

7070
/* now change pg_table to kernel virtual addresses */
7171
for (i = 0; i < PTRS_PER_PTE; ++i, ++pg_table) {
72-
pte_t pte = pfn_pte(virt_to_pfn(address), PAGE_INIT);
72+
pte_t pte = pfn_pte(virt_to_pfn((void *)address),
73+
PAGE_INIT);
7374
if (address >= (unsigned long) high_memory)
7475
pte_val(pte) = 0;
7576

arch/m68k/mm/motorola.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static struct list_head ptable_list[2] = {
102102
LIST_HEAD_INIT(ptable_list[1]),
103103
};
104104

105-
#define PD_PTABLE(page) ((ptable_desc *)&(virt_to_page(page)->lru))
105+
#define PD_PTABLE(page) ((ptable_desc *)&(virt_to_page((void *)(page))->lru))
106106
#define PD_PAGE(ptable) (list_entry(ptable, struct page, lru))
107107
#define PD_MARKBITS(dp) (*(unsigned int *)&PD_PAGE(dp)->index)
108108

@@ -201,7 +201,7 @@ int free_pointer_table(void *table, int type)
201201
list_del(dp);
202202
mmu_page_dtor((void *)page);
203203
if (type == TABLE_PTE)
204-
pgtable_pte_page_dtor(virt_to_page(page));
204+
pgtable_pte_page_dtor(virt_to_page((void *)page));
205205
free_page (page);
206206
return 1;
207207
} else if (ptable_list[type].next != dp) {

arch/m68k/mm/sun3mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void __init paging_init(void)
7575
/* now change pg_table to kernel virtual addresses */
7676
pg_table = (pte_t *) __va ((unsigned long) pg_table);
7777
for (i=0; i<PTRS_PER_PTE; ++i, ++pg_table) {
78-
pte_t pte = pfn_pte(virt_to_pfn(address), PAGE_INIT);
78+
pte_t pte = pfn_pte(virt_to_pfn((void *)address), PAGE_INIT);
7979
if (address >= (unsigned long)high_memory)
8080
pte_val (pte) = 0;
8181
set_pte (pg_table, pte);

arch/m68k/sun3/dvma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)
2929
j = *(volatile unsigned long *)kaddr;
3030
*(volatile unsigned long *)kaddr = j;
3131

32-
ptep = pfn_pte(virt_to_pfn(kaddr), PAGE_KERNEL);
32+
ptep = pfn_pte(virt_to_pfn((void *)kaddr), PAGE_KERNEL);
3333
pte = pte_val(ptep);
3434
// pr_info("dvma_remap: addr %lx -> %lx pte %08lx\n", kaddr, vaddr, pte);
3535
if(ptelist[(vaddr & 0xff000) >> PAGE_SHIFT] != pte) {

arch/m68k/sun3x/dvma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ inline int dvma_map_cpu(unsigned long kaddr,
125125
do {
126126
pr_debug("mapping %08lx phys to %08lx\n",
127127
__pa(kaddr), vaddr);
128-
set_pte(pte, pfn_pte(virt_to_pfn(kaddr),
128+
set_pte(pte, pfn_pte(virt_to_pfn((void *)kaddr),
129129
PAGE_KERNEL));
130130
pte++;
131131
kaddr += PAGE_SIZE;

0 commit comments

Comments
 (0)