Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f095df0a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/Voyager: remove X86_BIOS_REBOOT Kconfig quirk 



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: default avatarIngo Molnar <mingo@elte.hu>
parent 23394d1c

arch/x86/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

arch/x86/include/asm/proto.h

+0 −4
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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