summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorAlex Sverdlin <alexander.sverdlin@nokia.com>2021-05-05 07:58:01 +0100
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2021-06-07 12:56:20 +0100
commit890cb057a46d323fd8c77ebecb6485476614cd21 (patch)
tree11dd665cf10d77ae012a7058ac5a42c078db32a0 /arch/arm/include
parent4e271701c17dee70c6e1351c4d7d42e70405c6a9 (diff)
downloadlinux-stable-890cb057a46d323fd8c77ebecb6485476614cd21.tar.gz
linux-stable-890cb057a46d323fd8c77ebecb6485476614cd21.tar.bz2
linux-stable-890cb057a46d323fd8c77ebecb6485476614cd21.zip
ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link()
Will be used in the following patch. No functional change. Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/insn.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/insn.h b/arch/arm/include/asm/insn.h
index f20e08ac85ae..5475cbf9fb6b 100644
--- a/arch/arm/include/asm/insn.h
+++ b/arch/arm/include/asm/insn.h
@@ -13,18 +13,18 @@ arm_gen_nop(void)
}
unsigned long
-__arm_gen_branch(unsigned long pc, unsigned long addr, bool link);
+__arm_gen_branch(unsigned long pc, unsigned long addr, bool link, bool warn);
static inline unsigned long
arm_gen_branch(unsigned long pc, unsigned long addr)
{
- return __arm_gen_branch(pc, addr, false);
+ return __arm_gen_branch(pc, addr, false, true);
}
static inline unsigned long
-arm_gen_branch_link(unsigned long pc, unsigned long addr)
+arm_gen_branch_link(unsigned long pc, unsigned long addr, bool warn)
{
- return __arm_gen_branch(pc, addr, true);
+ return __arm_gen_branch(pc, addr, true, warn);
}
#endif