| 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 build errors in arc/include/asm/delay.h |
| |
| 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@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/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__( |
