From 1e9549ec2fd45ebb288241c4445486efa3164098 Mon Sep 17 00:00:00 2001 Message-Id: <1e9549ec2fd45ebb288241c4445486efa3164098.1429703426.git.panand@redhat.com> In-Reply-To: References: From: AKASHI Takahiro Date: Tue, 17 Feb 2015 15:53:07 +0900 Subject: [PATCH 07/15] arm64: fix elf-related header issues - add a missing EM_AARCH64 macro - linux/elf.h was also replaced with elf.h because they are conflicting each other. --- include/elf.h | 1 + kexec/arch/arm64/kexec-arm64.c | 3 +-- kexec/arch/arm64/kexec-elf-arm64.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/elf.h b/include/elf.h index 5db637ba2f60..cd2802ae1091 100644 --- a/include/elf.h +++ b/include/elf.h @@ -259,6 +259,7 @@ typedef struct #define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */ #define EM_XTENSA 94 /* Tensilica Xtensa Architecture */ #define EM_NUM 95 +#define EM_AARCH64 183 /* ARMv8-A */ /* If it is necessary to assign new unofficial EM_* values, please pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c index 86408598a465..eb68b6b3d9e3 100644 --- a/kexec/arch/arm64/kexec-arm64.c +++ b/kexec/arch/arm64/kexec-arm64.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -19,8 +20,6 @@ #include -#include - #include "dt-ops.h" #include "kexec.h" #include "crashdump.h" diff --git a/kexec/arch/arm64/kexec-elf-arm64.c b/kexec/arch/arm64/kexec-elf-arm64.c index 13dc5e2724d9..8b336054a6ab 100644 --- a/kexec/arch/arm64/kexec-elf-arm64.c +++ b/kexec/arch/arm64/kexec-elf-arm64.c @@ -5,12 +5,11 @@ #define _GNU_SOURCE #include +#include #include #include #include -#include - #include "dt-ops.h" #include "crashdump-arm64.h" #include "kexec-arm64.h" -- 2.1.0