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

Commit 3e8f7e35 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ed5e2332

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ config X86_HT 


config X86_BIOS_REBOOT

	bool

	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)

	depends on !X86_VISWS && !X86_VOYAGER

	default y



config X86_TRAMPOLINE
@@ -1161,7 +1161,7 @@ source kernel/Kconfig.hz 


config KEXEC

	bool "kexec system call"

	depends on X86_64 || X86_BIOS_REBOOT

	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/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o 
obj-y				+= cpu/

obj-y				+= acpi/

obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o

obj-$(CONFIG_X86_64)		+= reboot.o

obj-$(CONFIG_MCA)		+= mca_32.o

obj-$(CONFIG_X86_MSR)		+= msr.o

obj-$(CONFIG_X86_CPUID)		+= cpuid.o

include/asm-x86/proto.h

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