mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From a509baa477542eca7e6f6d8d23dc1ba04248a62f Mon Sep 17 00:00:00 2001
|
|
From: Fabio Estevam <festevam@gmail.com>
|
|
Date: Thu, 12 Jan 2012 17:20:20 -0800
|
|
Subject: [PATCH 046/129] include/linux/crash_dump.h needs elf.h
|
|
|
|
commit 1f536b9e9f85456df93614b3c2f6a1a2b7d7cb9b upstream.
|
|
|
|
Building an ARM target we get the following warnings:
|
|
|
|
CC arch/arm/kernel/setup.o
|
|
In file included from arch/arm/kernel/setup.c:39:
|
|
arch/arm/include/asm/elf.h:102:1: warning: "vmcore_elf64_check_arch" redefined
|
|
In file included from arch/arm/kernel/setup.c:24:
|
|
include/linux/crash_dump.h:30:1: warning: this is the location of the previous definition
|
|
|
|
Quoting Russell King:
|
|
|
|
"linux/crash_dump.h makes no attempt to include asm/elf.h, but it depends
|
|
on stuff in asm/elf.h to determine how stuff inside this file is defined
|
|
at parse time.
|
|
|
|
So, if asm/elf.h is included after linux/crash_dump.h or not at all, you
|
|
get a different result from the situation where asm/elf.h is included
|
|
before."
|
|
|
|
So add elf.h header to crash_dump.h to avoid this problem.
|
|
|
|
The original discussion about this can be found at:
|
|
http://www.spinics.net/lists/arm-kernel/msg154113.html
|
|
|
|
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
|
|
Cc: Russell King <rmk@arm.linux.org.uk>
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
include/linux/crash_dump.h | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
|
|
index 5c4abce..b936763 100644
|
|
--- a/include/linux/crash_dump.h
|
|
+++ b/include/linux/crash_dump.h
|
|
@@ -5,6 +5,7 @@
|
|
#include <linux/kexec.h>
|
|
#include <linux/device.h>
|
|
#include <linux/proc_fs.h>
|
|
+#include <linux/elf.h>
|
|
|
|
#define ELFCORE_ADDR_MAX (-1ULL)
|
|
#define ELFCORE_ADDR_ERR (-2ULL)
|
|
--
|
|
1.7.9.5
|
|
|