parisc: Rename pte_needs_flush() to pte_needs_cache_flush() in cache.c

danglin44 · hdeller · commit 52ce9406a962 · 2025-07-25T22:45:23.000+02:00
The local name used in cache.c conflicts the declaration in
include/asm-generic/tlb.h.

Signed-off-by: John David Anglin &lt;dave.anglin@bell.net&gt;
Signed-off-by: Helge Deller &lt;deller@gmx.de&gt;
Cc: stable@vger.kernel.org # v5.12+
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
@@ -429,7 +429,7 @@ static inline pte_t *get_ptep(struct mm_struct *mm, unsigned long addr)
 	return ptep;
 }
 
-static inline bool pte_needs_flush(pte_t pte)
+static inline bool pte_needs_cache_flush(pte_t pte)
 {
 	return (pte_val(pte) & (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_NO_CACHE))
 		== (_PAGE_PRESENT | _PAGE_ACCESSED);
@@ -630,7 +630,7 @@ static void flush_cache_page_if_present(struct vm_area_struct *vma,
 	ptep = get_ptep(vma->vm_mm, vmaddr);
 	if (ptep) {
 		pte = ptep_get(ptep);
-		needs_flush = pte_needs_flush(pte);
+		needs_flush = pte_needs_cache_flush(pte);
 		pte_unmap(ptep);
 	}
 	if (needs_flush)

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ static inline pte_t get_ptep(struct mm_struct mm, unsigned long addr)`
`429`	`429`	`return ptep;`
`430`	`430`	`}`
`431`	`431`
`432`		`-static inline bool pte_needs_flush(pte_t pte)`
	`432`	`+static inline bool pte_needs_cache_flush(pte_t pte)`
`433`	`433`	`{`
`434`	`434`	`return (pte_val(pte) & (_PAGE_PRESENT \| _PAGE_ACCESSED \| _PAGE_NO_CACHE))`
`435`	`435`	`== (_PAGE_PRESENT \| _PAGE_ACCESSED);`
`@@ -630,7 +630,7 @@ static void flush_cache_page_if_present(struct vm_area_struct *vma,`
`630`	`630`	`ptep = get_ptep(vma->vm_mm, vmaddr);`
`631`	`631`	`if (ptep) {`
`632`	`632`	`pte = ptep_get(ptep);`
`633`		`- needs_flush = pte_needs_flush(pte);`
	`633`	`+ needs_flush = pte_needs_cache_flush(pte);`
`634`	`634`	`pte_unmap(ptep);`
`635`	`635`	`}`
`636`	`636`	`if (needs_flush)`