* [PATCH 3.18 30/56] arc: fix build errors in arc/include/asm/delay.h [not found] <20180903164924.078355019@linuxfoundation.org> @ 2018-09-03 16:49 ` Greg Kroah-Hartman 2018-09-03 16:49 ` [PATCH 3.18 31/56] arc: fix type warnings in arc/mm/cache.c Greg Kroah-Hartman 1 sibling, 0 replies; 2+ messages in thread From: Greg Kroah-Hartman @ 2018-09-03 16:49 UTC (permalink / raw) To: linux-snps-arc 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap <rdunlap@infradead.org> [ Upstream commit 2423665ec53f2a29191b35382075e9834288a975 ] Fix build errors in arch/arc/'s delay.h: - add "extern unsigned long loops_per_jiffy;" - add <asm-generic/types.h> for "u64" In file included from ../drivers/infiniband/hw/cxgb3/cxio_hal.c:32: ../arch/arc/include/asm/delay.h: In function '__udelay': ../arch/arc/include/asm/delay.h:61:12: error: 'u64' undeclared (first use in this function) loops = ((u64) usecs * 4295 * HZ * loops_per_jiffy) >> 32; ^~~ In file included from ../drivers/infiniband/hw/cxgb3/cxio_hal.c:32: ../arch/arc/include/asm/delay.h: In function '__udelay': ../arch/arc/include/asm/delay.h:63:37: error: 'loops_per_jiffy' undeclared (first use in this function) loops = ((u64) usecs * 4295 * HZ * loops_per_jiffy) >> 32; ^~~~~~~~~~~~~~~ Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Vineet Gupta <vgupta at synopsys.com> Cc: linux-snps-arc at lists.infradead.org Cc: Elad Kanfi <eladkan at mellanox.com> Cc: Leon Romanovsky <leonro at mellanox.com> Cc: Ofer Levi <oferle at mellanox.com> Signed-off-by: Vineet Gupta <vgupta at synopsys.com> Signed-off-by: Sasha Levin <alexander.levin at microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> --- arch/arc/include/asm/delay.h | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arc/include/asm/delay.h +++ b/arch/arc/include/asm/delay.h @@ -17,8 +17,11 @@ #ifndef __ASM_ARC_UDELAY_H #define __ASM_ARC_UDELAY_H +#include <asm-generic/types.h> #include <asm/param.h> /* HZ */ +extern unsigned long loops_per_jiffy; + static inline void __delay(unsigned long loops) { __asm__ __volatile__( ^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 3.18 31/56] arc: fix type warnings in arc/mm/cache.c [not found] <20180903164924.078355019@linuxfoundation.org> 2018-09-03 16:49 ` [PATCH 3.18 30/56] arc: fix build errors in arc/include/asm/delay.h Greg Kroah-Hartman @ 2018-09-03 16:49 ` Greg Kroah-Hartman 1 sibling, 0 replies; 2+ messages in thread From: Greg Kroah-Hartman @ 2018-09-03 16:49 UTC (permalink / raw) To: linux-snps-arc 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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 at infradead.org> Cc: Vineet Gupta <vgupta at synopsys.com> Cc: linux-snps-arc at lists.infradead.org Cc: Elad Kanfi <eladkan at mellanox.com> Cc: Leon Romanovsky <leonro at mellanox.com> Cc: Ofer Levi <oferle at mellanox.com> Signed-off-by: Vineet Gupta <vgupta at synopsys.com> Signed-off-by: Sasha Levin <alexander.levin at microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org> --- arch/arc/mm/cache_arc700.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/arch/arc/mm/cache_arc700.c +++ b/arch/arc/mm/cache_arc700.c @@ -642,7 +642,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; @@ -662,8 +662,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)); } ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-03 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180903164924.078355019@linuxfoundation.org>
2018-09-03 16:49 ` [PATCH 3.18 30/56] arc: fix build errors in arc/include/asm/delay.h Greg Kroah-Hartman
2018-09-03 16:49 ` [PATCH 3.18 31/56] arc: fix type warnings in arc/mm/cache.c Greg Kroah-Hartman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).