aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Luis Vazquez Cao <fernando@intellilink.co.jp>2006-02-03 03:04:39 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 08:32:09 -0800
commit2c5d81a58106fa333467beab5f11dafab07b3e66 (patch)
tree7fabac3f87c1c0d385569cbc127df36e5ff6a05f
parentbb3b9cf122eb097ed9fe8ae50e1b0dbba9bbe447 (diff)
[PATCH] Compilation of kexec/kdump broken
The compilation of kexec/kdump seems to be broken for x86_64. Remove the dependency of kexec on CONFIG_IA32_EMULATION. Signed-off-by: Fernando Vazquez <fernando@intellilink.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-x86_64/kexec.h3
-rw-r--r--include/linux/elfcore.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86_64/kexec.h b/include/asm-x86_64/kexec.h
index ae28cd44bcd..c564bae0343 100644
--- a/include/asm-x86_64/kexec.h
+++ b/include/asm-x86_64/kexec.h
@@ -1,8 +1,9 @@
#ifndef _X86_64_KEXEC_H
#define _X86_64_KEXEC_H
+#include <linux/string.h>
+
#include <asm/page.h>
-#include <asm/proto.h>
#include <asm/ptrace.h>
/*
diff --git a/include/linux/elfcore.h b/include/linux/elfcore.h
index dbd7bb4a33b..0cf0bea010f 100644
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
@@ -5,6 +5,7 @@
#include <linux/signal.h>
#include <linux/time.h>
#include <linux/user.h>
+#include <linux/ptrace.h>
struct elf_siginfo
{