diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-28 04:46:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-30 17:15:34 -0400 |
commit | 3e8f7e35f3fd17eadef44e4679abb39a3806cf01 (patch) | |
tree | 8e8ea55506a28163d6b983ee0dd8bf43bcbf37c5 /arch/x86/Kconfig | |
parent | ed5e233284bc4aff965df7351da8426aa188c8f9 (diff) |
x86 VISWS: build fix
the 'reboot_force' flag is a notion that non-PC subarchitectures do
not have.
also, unify the X86_BIOS_REBOOT option between 32-bit and 64-bit
and get rid of a few unnecessary Kconfig and Makefile complications
that way.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 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 | ||
181 | config X86_BIOS_REBOOT | 181 | config 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 | ||
186 | config X86_TRAMPOLINE | 186 | config X86_TRAMPOLINE |
@@ -1161,7 +1161,7 @@ source kernel/Kconfig.hz | |||
1161 | 1161 | ||
1162 | config KEXEC | 1162 | config 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 |