Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mark Rutland and committed by
Will Deacon
3e00e39d 78b92c73

+9 -3
+1 -3
arch/arm64/include/asm/alternative-macros.h
··· 3 3 #define __ASM_ALTERNATIVE_MACROS_H 4 4 5 5 #include <asm/cpucaps.h> 6 + #include <asm/insn.h> 6 7 7 8 #define ARM64_CB_PATCH ARM64_NCAPS 8 - 9 - /* A64 instructions are always 32 bits. */ 10 - #define AARCH64_INSN_SIZE 4 11 9 12 10 #ifndef __ASSEMBLY__ 13 11
+3
arch/arm64/include/asm/insn.h
··· 12 12 13 13 #include <asm/alternative.h> 14 14 15 + /* A64 instructions are always 32 bits. */ 16 + #define AARCH64_INSN_SIZE 4 17 + 15 18 #ifndef __ASSEMBLY__ 16 19 /* 17 20 * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a
+1
arch/arm64/include/asm/kvm_asm.h
··· 8 8 #define __ARM_KVM_ASM_H__ 9 9 10 10 #include <asm/hyp_image.h> 11 + #include <asm/insn.h> 11 12 #include <asm/virt.h> 12 13 13 14 #define ARM_EXIT_WITH_SERROR_BIT 31
+1
arch/arm64/kernel/cpufeature.c
··· 76 76 #include <asm/cpufeature.h> 77 77 #include <asm/cpu_ops.h> 78 78 #include <asm/fpsimd.h> 79 + #include <asm/insn.h> 79 80 #include <asm/kvm_host.h> 80 81 #include <asm/mmu_context.h> 81 82 #include <asm/mte.h>
+1
arch/arm64/kernel/patching.c
··· 8 8 9 9 #include <asm/cacheflush.h> 10 10 #include <asm/fixmap.h> 11 + #include <asm/insn.h> 11 12 #include <asm/kprobes.h> 12 13 #include <asm/patching.h> 13 14 #include <asm/sections.h>
+1
arch/arm64/kernel/traps.c
··· 36 36 #include <asm/esr.h> 37 37 #include <asm/exception.h> 38 38 #include <asm/extable.h> 39 + #include <asm/insn.h> 39 40 #include <asm/kprobes.h> 40 41 #include <asm/patching.h> 41 42 #include <asm/traps.h>
+1
arch/arm64/net/bpf_jit_comp.c
··· 16 16 #include <asm/byteorder.h> 17 17 #include <asm/cacheflush.h> 18 18 #include <asm/debug-monitors.h> 19 + #include <asm/insn.h> 19 20 #include <asm/set_memory.h> 20 21 21 22 #include "bpf_jit.h"