diff options
Diffstat (limited to 'arch/arm64/include/asm/assembler.h')
-rw-r--r-- | arch/arm64/include/asm/assembler.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index aeb4554b3af3..d8855ca6068a 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h | |||
@@ -108,6 +108,15 @@ | |||
108 | .endm | 108 | .endm |
109 | 109 | ||
110 | /* | 110 | /* |
111 | * NOP sequence | ||
112 | */ | ||
113 | .macro nops, num | ||
114 | .rept \num | ||
115 | nop | ||
116 | .endr | ||
117 | .endm | ||
118 | |||
119 | /* | ||
111 | * Emit an entry into the exception table | 120 | * Emit an entry into the exception table |
112 | */ | 121 | */ |
113 | .macro _asm_extable, from, to | 122 | .macro _asm_extable, from, to |
@@ -383,15 +392,11 @@ alternative_endif | |||
383 | */ | 392 | */ |
384 | .macro post_ttbr0_update_workaround | 393 | .macro post_ttbr0_update_workaround |
385 | #ifdef CONFIG_CAVIUM_ERRATUM_27456 | 394 | #ifdef CONFIG_CAVIUM_ERRATUM_27456 |
386 | alternative_if_not ARM64_WORKAROUND_CAVIUM_27456 | 395 | alternative_if ARM64_WORKAROUND_CAVIUM_27456 |
387 | nop | ||
388 | nop | ||
389 | nop | ||
390 | alternative_else | ||
391 | ic iallu | 396 | ic iallu |
392 | dsb nsh | 397 | dsb nsh |
393 | isb | 398 | isb |
394 | alternative_endif | 399 | alternative_else_nop_endif |
395 | #endif | 400 | #endif |
396 | .endm | 401 | .endm |
397 | 402 | ||