aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig4
-rw-r--r--arch/x86/kernel/Makefile1
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f70e3e3a9fa7..80303187b872 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -180,7 +180,7 @@ config X86_HT
180 180
181config X86_BIOS_REBOOT 181config X86_BIOS_REBOOT
182 bool 182 bool
183 depends on X86_32 && !(X86_VISWS || X86_VOYAGER) 183 depends on !X86_VISWS && !X86_VOYAGER
184 default y 184 default y
185 185
186config X86_TRAMPOLINE 186config X86_TRAMPOLINE
@@ -1161,7 +1161,7 @@ source kernel/Kconfig.hz
1161 1161
1162config KEXEC 1162config KEXEC
1163 bool "kexec system call" 1163 bool "kexec system call"
1164 depends on X86_64 || X86_BIOS_REBOOT 1164 depends on X86_BIOS_REBOOT
1165 help 1165 help
1166 kexec is a system call that implements the ability to shutdown your 1166 kexec is a system call that implements the ability to shutdown your
1167 current kernel, and to start another kernel. It is like a reboot 1167 current kernel, and to start another kernel. It is like a reboot
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 30d54ed27e55..bbdacb398d48 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o
40obj-y += cpu/ 40obj-y += cpu/
41obj-y += acpi/ 41obj-y += acpi/
42obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o 42obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
43obj-$(CONFIG_X86_64) += reboot.o
44obj-$(CONFIG_MCA) += mca_32.o 43obj-$(CONFIG_MCA) += mca_32.o
45obj-$(CONFIG_X86_MSR) += msr.o 44obj-$(CONFIG_X86_MSR) += msr.o
46obj-$(CONFIG_X86_CPUID) += cpuid.o 45obj-$(CONFIG_X86_CPUID) += cpuid.o