summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/Kbuild
diff options
context:
space:
mode:
authorMarc Zyngier <Marc.Zyngier@arm.com>2012-10-19 18:33:27 +0200
committerCatalin Marinas <catalin.marinas@arm.com>2012-10-20 12:12:01 +0200
commitaeed41a9371ee02257b608eb06a9058507a7d0f4 (patch)
tree7b4a24afc4942237d7d762a5117df1db02879dea /arch/arm64/include/asm/Kbuild
parentarm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints (diff)
downloadlinux-aeed41a9371ee02257b608eb06a9058507a7d0f4.tar.xz
linux-aeed41a9371ee02257b608eb06a9058507a7d0f4.zip
arm64: fix alignment padding in assembly code
An interesting effect of using the generic version of linkage.h is that the padding is defined in terms of x86 NOPs, which can have even more interesting effects when the assembly code looks like this: ENTRY(func1) mov x0, xzr ENDPROC(func1) // fall through ENTRY(func2) mov x0, #1 ret ENDPROC(func2) Admittedly, the code is not very nice. But having code from another architecture doesn't look completely sane either. The fix is to add arm64's version of linkage.h, which causes the insertion of proper AArch64 NOPs. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/Kbuild')
-rw-r--r--arch/arm64/include/asm/Kbuild1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index fe77e51a7847..a581a2205938 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -18,7 +18,6 @@ generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
-generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
generic-y += mman.h