| From foo@baz Sun Aug 26 09:13:00 CEST 2018 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Thu, 26 Jul 2018 20:16:35 -0700 |
| Subject: arc: fix type warnings in arc/mm/cache.c |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| [ Upstream commit ec837d620c750c0d4996a907c8c4f7febe1bbeee ] |
| |
| Fix type warnings in arch/arc/mm/cache.c. |
| |
| ../arch/arc/mm/cache.c: In function 'flush_anon_page': |
| ../arch/arc/mm/cache.c:1062:55: warning: passing argument 2 of '__flush_dcache_page' makes integer from pointer without a cast [-Wint-conversion] |
| __flush_dcache_page((phys_addr_t)page_address(page), page_address(page)); |
| ^~~~~~~~~~~~~~~~~~ |
| ../arch/arc/mm/cache.c:1013:59: note: expected 'long unsigned int' but argument is of type 'void *' |
| void __flush_dcache_page(phys_addr_t paddr, unsigned long vaddr) |
| ~~~~~~~~~~~~~~^~~~~ |
| |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Cc: Vineet Gupta <vgupta@synopsys.com> |
| Cc: linux-snps-arc@lists.infradead.org |
| Cc: Elad Kanfi <eladkan@mellanox.com> |
| Cc: Leon Romanovsky <leonro@mellanox.com> |
| Cc: Ofer Levi <oferle@mellanox.com> |
| Signed-off-by: Vineet Gupta <vgupta@synopsys.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arc/mm/cache.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arc/mm/cache.c |
| +++ b/arch/arc/mm/cache.c |
| @@ -1035,7 +1035,7 @@ void flush_cache_mm(struct mm_struct *mm |
| void flush_cache_page(struct vm_area_struct *vma, unsigned long u_vaddr, |
| unsigned long pfn) |
| { |
| - unsigned int paddr = pfn << PAGE_SHIFT; |
| + phys_addr_t paddr = pfn << PAGE_SHIFT; |
| |
| u_vaddr &= PAGE_MASK; |
| |
| @@ -1055,8 +1055,9 @@ void flush_anon_page(struct vm_area_stru |
| unsigned long u_vaddr) |
| { |
| /* TBD: do we really need to clear the kernel mapping */ |
| - __flush_dcache_page(page_address(page), u_vaddr); |
| - __flush_dcache_page(page_address(page), page_address(page)); |
| + __flush_dcache_page((phys_addr_t)page_address(page), u_vaddr); |
| + __flush_dcache_page((phys_addr_t)page_address(page), |
| + (phys_addr_t)page_address(page)); |
| |
| } |
| |