]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
arm64: move SEGMENT_ALIGN to <asm/memory.h>
authorMark Rutland <mark.rutland@arm.com>
Fri, 14 Jul 2017 14:38:43 +0000 (15:38 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Tue, 27 Feb 2018 16:32:09 +0000 (11:32 -0500)
commitcdcda4102a9fc226026c5b25708db6378aa7c665
treea8fc09774896c907709278909bf3c7f206c13b3f
parent84d26a5eaef3a07db1029eaeae4de2171a8ee577
arm64: move SEGMENT_ALIGN to <asm/memory.h>

Currently we define SEGMENT_ALIGN directly in our vmlinux.lds.S.

This is unfortunate, as the EFI stub currently open-codes the same
number, and in future we'll want to fiddle with this.

This patch moves the definition to our <asm/memory.h>, where it can be
used by both vmlinux.lds.S and the EFI stub code.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
(cherry picked from commit 8018ba4edfd3a8b46f876c65988bd0d8e35c32a6)

CVE-2017-5753
CVE-2017-5715
CVE-2017-5754

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/arm64/include/asm/memory.h
arch/arm64/kernel/vmlinux.lds.S