diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2021-06-09 12:23:01 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-06-11 12:19:27 +0200 |
| commit | 3e00e39d9dad48360ebd518726ebf81da1b84c10 (patch) | |
| tree | 47b4ad9a277ec6d5f6c2fe8adb5a57b5b0266231 /arch/arm64/include/asm/alternative-macros.h | |
| parent | arm64: insn: decouple patching from insn code (diff) | |
| download | linux-3e00e39d9dad48360ebd518726ebf81da1b84c10.tar.xz linux-3e00e39d9dad48360ebd518726ebf81da1b84c10.zip | |
arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h>
For histroical reasons, we define AARCH64_INSN_SIZE in
<asm/alternative-macros.h>, but it would make more sense to do so in
<asm/insn.h>. Let's move it into <asm/insn.h>, and add the necessary
include directives for this.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210609102301.17332-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/alternative-macros.h')
| -rw-r--r-- | arch/arm64/include/asm/alternative-macros.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/alternative-macros.h b/arch/arm64/include/asm/alternative-macros.h index 8a078fc662ac..703fbf310b79 100644 --- a/arch/arm64/include/asm/alternative-macros.h +++ b/arch/arm64/include/asm/alternative-macros.h @@ -3,12 +3,10 @@ #define __ASM_ALTERNATIVE_MACROS_H #include <asm/cpucaps.h> +#include <asm/insn.h> #define ARM64_CB_PATCH ARM64_NCAPS -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 - #ifndef __ASSEMBLY__ #include <linux/stringify.h> |