projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
armv7: add reset timeout to identify_nand_chip
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
setjmp.h
diff --git
a/arch/arm/include/asm/setjmp.h
b/arch/arm/include/asm/setjmp.h
index ae738b2457ba13634ae9ab7198ec3c11bcc3a630..f7b97efc59d6284281a5ecc2ff19489817395757 100644
(file)
--- a/
arch/arm/include/asm/setjmp.h
+++ b/
arch/arm/include/asm/setjmp.h
@@
-43,6
+43,7
@@
static inline int setjmp(jmp_buf jmp)
#else
asm volatile(
#ifdef CONFIG_SYS_THUMB_BUILD
#else
asm volatile(
#ifdef CONFIG_SYS_THUMB_BUILD
+ ".align 2\n"
"adr r0, jmp_target\n"
"add r0, r0, $1\n"
#else
"adr r0, jmp_target\n"
"add r0, r0, $1\n"
#else
@@
-52,7
+53,8
@@
static inline int setjmp(jmp_buf jmp)
"mov r2, sp\n"
"stm r1!, {r0, r2, r4, r5, r6, r7}\n"
"b 2f\n"
"mov r2, sp\n"
"stm r1!, {r0, r2, r4, r5, r6, r7}\n"
"b 2f\n"
- "jmp_target: "
+ ".align 2\n"
+ "jmp_target: \n"
"mov %0, #1\n"
"2:\n"
: "+l" (r)
"mov %0, #1\n"
"2:\n"
: "+l" (r)