summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/alternative-macros.h
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2021-06-24 15:03:24 +0200
committerWill Deacon <will@kernel.org>2021-06-24 15:03:24 +0200
commit181a126979307a0192f41a4a1fac235d6f4ac9f0 (patch)
treedda07f64a9f911c41a7e09287fa794f2dbba36ae /arch/arm64/include/asm/alternative-macros.h
parentMerge branch 'for-next/entry' into for-next/core (diff)
parentarm64: insn: avoid circular include dependency (diff)
downloadlinux-181a126979307a0192f41a4a1fac235d6f4ac9f0.tar.xz
linux-181a126979307a0192f41a4a1fac235d6f4ac9f0.zip
Merge branch 'for-next/insn' into for-next/core
Refactoring of our instruction decoding routines and addition of some missing encodings. * for-next/insn: arm64: insn: avoid circular include dependency arm64: insn: move AARCH64_INSN_SIZE into <asm/insn.h> arm64: insn: decouple patching from insn code arm64: insn: Add load/store decoding helpers arm64: insn: Add some opcodes to instruction decoder arm64: insn: Add barrier encodings arm64: insn: Add SVE instruction class arm64: Move instruction encoder/decoder under lib/ arm64: Move aarch32 condition check functions arm64: Move patching utilities out of instruction encoding/decoding
Diffstat (limited to 'arch/arm64/include/asm/alternative-macros.h')
-rw-r--r--arch/arm64/include/asm/alternative-macros.h4
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 477703578caa..7e157ab6cd50 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-def.h>
#define ARM64_CB_PATCH ARM64_NCAPS
-/* A64 instructions are always 32 bits. */
-#define AARCH64_INSN_SIZE 4
-
#ifndef __ASSEMBLY__
#include <linux/stringify.h>