Commit 3e00e39d authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

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: default avatarMark 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: default avatarWill Deacon <will@kernel.org>
parent 78b92c73

arch/arm64/include/asm/alternative-macros.h

+1 −3
Original line number Diff line number Diff line
@@ -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>

arch/arm64/include/asm/insn.h

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 


#include <asm/alternative.h>



/* A64 instructions are always 32 bits. */

#define	AARCH64_INSN_SIZE		4



#ifndef __ASSEMBLY__

/*

 * ARM Architecture Reference Manual for ARMv8 Profile-A, Issue A.a

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define __ARM_KVM_ASM_H__



#include <asm/hyp_image.h>

#include <asm/insn.h>

#include <asm/virt.h>



#define ARM_EXIT_WITH_SERROR_BIT  31

arch/arm64/kernel/cpufeature.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include <asm/cpufeature.h>

#include <asm/cpu_ops.h>

#include <asm/fpsimd.h>

#include <asm/insn.h>

#include <asm/kvm_host.h>

#include <asm/mmu_context.h>

#include <asm/mte.h>

arch/arm64/kernel/patching.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <asm/cacheflush.h>

#include <asm/fixmap.h>

#include <asm/insn.h>

#include <asm/kprobes.h>

#include <asm/patching.h>

#include <asm/sections.h>