iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/Voyager: remove X86_BIOS_REBOOT Kconfig quirk

Browse Source 
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>
This commit is contained in:
Ingo Molnar 2009-01-27 17:17:55 +01:00
parent 23394d1c93
commit f095df0a0c
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/Kconfig
View File

@ -190,11 +190,6 @@ config X86_HT
depends on SMP depends on SMP
default y default y
config X86_BIOS_REBOOT
bool
depends on !X86_VOYAGER
default y
config X86_TRAMPOLINE config X86_TRAMPOLINE
bool bool
depends on SMP || (64BIT && ACPI_SLEEP) depends on SMP || (64BIT && ACPI_SLEEP)
@ -1361,7 +1356,6 @@ source kernel/Kconfig.hz
config KEXEC config KEXEC
bool "kexec system call" bool "kexec system call"
depends on X86_BIOS_REBOOT
help help
kexec is a system call that implements the ability to shutdown your kexec is a system call that implements the ability to shutdown your
current kernel, and to start another kernel. It is like a reboot current kernel, and to start another kernel. It is like a reboot

4
arch/x86/include/asm/proto.h
View File

@ -18,11 +18,7 @@ extern void syscall32_cpu_init(void);
extern void check_efer(void); extern void check_efer(void);
#ifdef CONFIG_X86_BIOS_REBOOT
extern int reboot_force; 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); long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);

2
arch/x86/kernel/Makefile
View File

@ -50,7 +50,7 @@ obj-y += step.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += cpu/ obj-y += cpu/
obj-y += acpi/ obj-y += acpi/
obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-y += reboot.o
obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_MCA) += mca_32.o
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_X86_CPUID) += cpuid.o