From d46a3813c6e78319e81ad0af2b6d55473408c769 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 17:17:55 +0100
Subject: [PATCH] --- yaml --- r: 136639 b: refs/heads/master c:
 f095df0a0cb35a52605541f619d038339b90d7cc h: refs/heads/master i:   136637:
 cabbc799a248c745a338598155ca976824fbdc12   136635:
 f355edac2719ffd4a559bb34225135a73b712937   136631:
 480c74fdf2a6e6cddd6d293b4370bf002f3858a8   136623:
 839ea165e9e979c5f1f547dd2d3931564d9aa92d   136607:
 b51c7d5e96f4cd4348e1b39660e7777c2df3bc16   136575:
 3200d94ac45d63995c1079fdd3b5eaa743090553 v: v3

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

diff --git a/[refs] b/[refs]
index 6d6913303576..b185baadd467 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23394d1c9346d9c0aabbc1b6fca52a9c0aa1c297
+refs/heads/master: f095df0a0cb35a52605541f619d038339b90d7cc
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 1d50c9de4d20..c0d79ab366de 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -190,11 +190,6 @@ config X86_HT
 	depends on SMP
 	default y
 
-config X86_BIOS_REBOOT
-	bool
-	depends on !X86_VOYAGER
-	default y
-
 config X86_TRAMPOLINE
 	bool
 	depends on SMP || (64BIT && ACPI_SLEEP)
@@ -1361,7 +1356,6 @@ source kernel/Kconfig.hz
 
 config KEXEC
 	bool "kexec system call"
-	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/include/asm/proto.h b/trunk/arch/x86/include/asm/proto.h
index d6a22f92ba77..49fb3ecf3bb3 100644
--- a/trunk/arch/x86/include/asm/proto.h
+++ b/trunk/arch/x86/include/asm/proto.h
@@ -18,11 +18,7 @@ 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);
 
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index dc05a57a474a..24f357e7557a 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -50,7 +50,7 @@ obj-y				+= step.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+obj-y				+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o