Unverified Commit 174f5771 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3298 ARM: Add unwinding annotations to __loop.*delay functions 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xu Kuohai <xukuohai@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/E6E74IZU3B7IMXI37EQNMRTEZEAA4AVY/ 
 
https://gitee.com/openeuler/kernel/issues/I8MTBB 
 
Link:https://gitee.com/openeuler/kernel/pulls/3298

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 7f688be7 d50984f0

arch/arm/lib/delay-loop.S

+5 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/delay.h>

#include <asm/unwind.h>



#ifdef CONFIG_ARCH_RPC

		.arch	armv4
@@ -25,6 +26,7 @@ 
 */



ENTRY(__loop_udelay)

UNWIND(.fnstart)

		ldr	r2, .LC1

		mul	r0, r2, r0		@ r0 = delay_us * UDELAY_MULT

ENTRY(__loop_const_udelay)			@ 0 <= r0 <= 0xfffffaf0
@@ -58,6 +60,7 @@ ENTRY(__loop_delay) 
#endif

		bhi	__loop_delay

		ret	lr

ENDPROC(__loop_udelay)

ENDPROC(__loop_const_udelay)

ENDPROC(__loop_delay)

ENDPROC(__loop_const_udelay)

UNWIND(.fnend)

ENDPROC(__loop_udelay)