From 33a08d206dea9894696294a3f371aafc5a3c9721 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 28 Apr 2008 10:46:58 +0200
Subject: [PATCH] --- yaml --- r: 95616 b: refs/heads/master c:
 3e8f7e35f3fd17eadef44e4679abb39a3806cf01 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/Kconfig         | 4 ++--
 trunk/arch/x86/kernel/Makefile | 1 -
 trunk/include/asm-x86/proto.h  | 4 ++++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 108638dec129..ed830f71b31d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed5e233284bc4aff965df7351da8426aa188c8f9
+refs/heads/master: 3e8f7e35f3fd17eadef44e4679abb39a3806cf01
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index f70e3e3a9fa7..80303187b872 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -180,7 +180,7 @@ config X86_HT
 
 config X86_BIOS_REBOOT
 	bool
-	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+	depends on !X86_VISWS && !X86_VOYAGER
 	default y
 
 config X86_TRAMPOLINE
@@ -1161,7 +1161,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
 	bool "kexec system call"
-	depends on X86_64 || X86_BIOS_REBOOT
+	depends on X86_BIOS_REBOOT
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 30d54ed27e55..bbdacb398d48 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
-obj-$(CONFIG_X86_64)		+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index 1e17bcce450e..6c8b41b03f6d 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -20,7 +20,11 @@ extern void syscall32_cpu_init(void);
 
 extern void check_efer(void);
 
+#ifdef CONFIG_X86_BIOS_REBOOT
 extern int reboot_force;
+#else
+static const int reboot_force = 0;
+#endif
 
 long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);