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