diff options
-rw-r--r-- | Documentation/x86/boot.txt | 4 | ||||
-rw-r--r-- | arch/x86/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 9efceff51bfb..f15cb74c4f78 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
@@ -1013,7 +1013,7 @@ boot_params as that of 16-bit boot protocol, the boot loader should | |||
1013 | also fill the additional fields of the struct boot_params as that | 1013 | also fill the additional fields of the struct boot_params as that |
1014 | described in zero-page.txt. | 1014 | described in zero-page.txt. |
1015 | 1015 | ||
1016 | After setupping the struct boot_params, the boot loader can load the | 1016 | After setting up the struct boot_params, the boot loader can load the |
1017 | 32/64-bit kernel in the same way as that of 16-bit boot protocol. | 1017 | 32/64-bit kernel in the same way as that of 16-bit boot protocol. |
1018 | 1018 | ||
1019 | In 32-bit boot protocol, the kernel is started by jumping to the | 1019 | In 32-bit boot protocol, the kernel is started by jumping to the |
@@ -1023,7 +1023,7 @@ In 32-bit boot protocol, the kernel is started by jumping to the | |||
1023 | At entry, the CPU must be in 32-bit protected mode with paging | 1023 | At entry, the CPU must be in 32-bit protected mode with paging |
1024 | disabled; a GDT must be loaded with the descriptors for selectors | 1024 | disabled; a GDT must be loaded with the descriptors for selectors |
1025 | __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat | 1025 | __BOOT_CS(0x10) and __BOOT_DS(0x18); both descriptors must be 4G flat |
1026 | segment; __BOOS_CS must have execute/read permission, and __BOOT_DS | 1026 | segment; __BOOT_CS must have execute/read permission, and __BOOT_DS |
1027 | must have read/write permission; CS must be __BOOT_CS and DS, ES, SS | 1027 | must have read/write permission; CS must be __BOOT_CS and DS, ES, SS |
1028 | must be __BOOT_DS; interrupt must be disabled; %esi must hold the base | 1028 | must be __BOOT_DS; interrupt must be disabled; %esi must hold the base |
1029 | address of the struct boot_params; %ebp, %edi and %ebx must be zero. | 1029 | address of the struct boot_params; %ebp, %edi and %ebx must be zero. |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 110cfad24f26..6c304438b503 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -310,7 +310,7 @@ config X86_X2APIC | |||
310 | If you don't know what to do here, say N. | 310 | If you don't know what to do here, say N. |
311 | 311 | ||
312 | config X86_MPPARSE | 312 | config X86_MPPARSE |
313 | bool "Enable MPS table" if ACPI | 313 | bool "Enable MPS table" if ACPI || SFI |
314 | default y | 314 | default y |
315 | depends on X86_LOCAL_APIC | 315 | depends on X86_LOCAL_APIC |
316 | ---help--- | 316 | ---help--- |