Skip to content

Commit 413c06b

Browse files
LoveKarlssonkartben
authored andcommitted
arch: arm: Replaced __volatile__ with volatile
IAR doesn't support the __volatile__ keyword, and since the toolchain.h isn't included by these arm-specific files and other arm-specific files already uses volatile, I've made them all use volatile. Signed-off-by: Lars-Ove Karlsson <lars-ove.karlsson@iar.com>
1 parent a54d4ac commit 413c06b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

arch/arm/core/cortex_a_r/semihost.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ long semihost_exec(enum semihost_instr instr, void *args)
1919
register long ret __asm__ ("r0");
2020

2121
if (IS_ENABLED(CONFIG_ISA_THUMB2)) {
22-
__asm__ __volatile__ ("svc 0xab"
22+
__asm__ volatile ("svc 0xab"
2323
: "=r" (ret) : "r" (r0), "r" (r1) : "memory");
2424
} else {
25-
__asm__ __volatile__ ("svc 0x123456"
25+
__asm__ volatile ("svc 0x123456"
2626
: "=r" (ret) : "r" (r0), "r" (r1) : "memory");
2727
}
2828
return ret;

arch/arm/core/cortex_m/semihost.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ long semihost_exec(enum semihost_instr instr, void *args)
1313
register void *r1 __asm__("r1") = args;
1414
register int ret __asm__("r0");
1515

16-
__asm__ __volatile__("bkpt 0xab" : "=r"(ret) : "r"(r0), "r"(r1) : "memory");
16+
__asm__ volatile("bkpt 0xab" : "=r"(ret) : "r"(r0), "r"(r1) : "memory");
1717
return ret;
1818
}

arch/arm/core/mmu/arm_mmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -805,10 +805,10 @@ int z_arm_mmu_init(void)
805805
}
806806

807807
/* Clear TTBR1 */
808-
__asm__ __volatile__("mcr p15, 0, %0, c2, c0, 1" : : "r"(reg_val));
808+
__asm__ volatile("mcr p15, 0, %0, c2, c0, 1" : : "r"(reg_val));
809809

810810
/* Write TTBCR: EAE, security not yet relevant, N[2:0] = 0 */
811-
__asm__ __volatile__("mcr p15, 0, %0, c2, c0, 2"
811+
__asm__ volatile("mcr p15, 0, %0, c2, c0, 2"
812812
: : "r"(reg_val));
813813

814814
/* Write TTBR0 */

0 commit comments

Comments
 (0)