Skip to content

Commit

Permalink
x86/Voyager: remove X86_BIOS_REBOOT Kconfig quirk
Browse files Browse the repository at this point in the history
Voyager has this Kconfig quirk:

config X86_BIOS_REBOOT
	bool
	depends on !X86_VOYAGER
	default y

Voyager should use the existing machine_ops.emergency_restart reboot
quirk mechanism instead of a build-time quirk.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jan 29, 2009
1 parent 23394d1 commit f095df0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
6 changes: 0 additions & 6 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions arch/x86/include/asm/proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f095df0

Please sign in to comment.