---

yaml --- r: 136639 b: refs/heads/master c: f095df0 h: refs/heads/master i: 136637: cabbc79 136635: f355eda 136631: 480c74f 136623: 839ea16 136607: b51c7d5 136575: 3200d94 v: v3
git-mirror · Jan 29, 2009 · d46a381 · d46a381
1 parent b3eb775
commit d46a381
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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