Skip to contentSkip to conversation

Patch "arc: fix build errors in arc/include/asm/delay.h" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Aug 26, 2018 Synopsys ARC architecture

lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

arc: fix build errors in arc/include/asm/delay.h

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arc-fix-build-errors-in-arc-include-asm-delay.h.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <stable at vger.kernel.org> know about it.

Quoted 1 line

From foo at baz Sun Aug 26 09:16:12 CEST 2018

From: Randy Dunlap <[email protected]>
Date: Thu, 26 Jul 2018 20:16:35 -0700
Subject: arc: fix build errors in arc/include/asm/delay.h

From: Randy Dunlap <[email protected]>

[ 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(+)
arch/arc/include/asm/delay.h +3 -0
@@ -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__(

Patches currently in stable-queue which might be from rdunlap at infradead.org are

queue-4.9/usb-phy-fix-ppc64-build-errors-in-phy-fsl-usb.c.patch queue-4.9/net-prevent-isa-drivers-from-building-on-ppc32.patch queue-4.9/arc-fix-build-errors-in-arc-include-asm-delay.h.patch queue-4.9/arc-fix-data-type-errors-in-platform-headers.patch queue-4.9/media-staging-omap4iss-include-asm-cacheflush.h-after-generic-includes.patch queue-4.9/arc-fix-type-warnings-in-arc-mm-cache.c.patch