mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
|
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||
|
|
index 4b20846..520cde8 100644
|
||
|
|
--- a/arch/x86/Kconfig
|
||
|
|
+++ b/arch/x86/Kconfig
|
||
|
|
@@ -972,6 +972,10 @@
|
||
|
|
XFree86 to initialize some video cards via BIOS. Disabling this
|
||
|
|
option saves about 6k.
|
||
|
|
|
||
|
|
+config X86_ESPFIX64
|
||
|
|
+ def_bool y
|
||
|
|
+ depends on X86_64
|
||
|
|
+
|
||
|
|
config TOSHIBA
|
||
|
|
tristate "Toshiba Laptop support"
|
||
|
|
depends on X86_32
|
||
|
|
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
|
||
|
|
index 0fde293..111eb35 100644
|
||
|
|
--- a/arch/x86/kernel/Makefile
|
||
|
|
+++ b/arch/x86/kernel/Makefile
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
obj-y += syscall_$(BITS).o
|
||
|
|
obj-$(CONFIG_X86_64) += vsyscall_64.o
|
||
|
|
obj-$(CONFIG_X86_64) += vsyscall_emu_64.o
|
||
|
|
-obj-$(CONFIG_X86_64) += espfix_64.o
|
||
|
|
+obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
|
||
|
|
obj-y += bootflag.o e820.o
|
||
|
|
obj-y += pci-dma.o quirks.o topology.o kdebugfs.o
|
||
|
|
obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
|
||
|
|
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
||
|
|
index 9f009cc..fe86275 100644
|
||
|
|
--- a/arch/x86/kernel/smpboot.c
|
||
|
|
+++ b/arch/x86/kernel/smpboot.c
|
||
|
|
@@ -267,7 +267,7 @@
|
||
|
|
/*
|
||
|
|
* Enable the espfix hack for this CPU
|
||
|
|
*/
|
||
|
|
-#ifdef CONFIG_X86_64
|
||
|
|
+#ifdef CONFIG_X86_ESPFIX64
|
||
|
|
init_espfix_ap();
|
||
|
|
#endif
|
||
|
|
|
||
|
|
diff --git a/init/main.c b/init/main.c
|
||
|
|
index a9e4a76..544cccf 100644
|
||
|
|
--- a/init/main.c
|
||
|
|
+++ b/init/main.c
|
||
|
|
@@ -605,7 +605,7 @@
|
||
|
|
if (efi_enabled(EFI_RUNTIME_SERVICES))
|
||
|
|
efi_enter_virtual_mode();
|
||
|
|
#endif
|
||
|
|
-#ifdef CONFIG_X86_64
|
||
|
|
+#ifdef CONFIG_X86_ESPFIX64
|
||
|
|
/* Should be run before the first non-init thread is created */
|
||
|
|
init_espfix_bsp();
|
||
|
|
#endif
|