korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-27 16:25:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull x86 boot updates from Ingo Molnar:
 "Misc cleanups/simplifications by Borislav Petkov, Paul Bolle and Wei
  Yang"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/64: Optimize fixmap page fixup
  x86/boot: Simplify the GDTR calculation assembly code a bit
  x86/boot/build: Remove always empty $(USERINCLUDE)
This commit is contained in:
Linus Torvalds 2016-12-12 14:13:30 -08:00
commit 06cc6b969c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/boot/Makefile
View File

@ -65,7 +65,7 @@ clean-files += cpustr.h
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
GCOV_PROFILE := n GCOV_PROFILE := n
UBSAN_SANITIZE := n UBSAN_SANITIZE := n

3
arch/x86/boot/compressed/head_64.S
View File

@ -119,8 +119,7 @@ ENTRY(startup_32)
*/ */
/* Load new GDT with the 64bit segments using 32bit descriptor */ /* Load new GDT with the 64bit segments using 32bit descriptor */
leal gdt(%ebp), %eax addl %ebp, gdt+2(%ebp)
movl %eax, gdt+2(%ebp)
lgdt gdt(%ebp) lgdt gdt(%ebp)
/* Enable PAE mode */ /* Enable PAE mode */

8
arch/x86/kernel/head_64.S
View File

@ -142,6 +142,9 @@ startup_64:
decl %ecx decl %ecx
jnz 1b jnz 1b
test %rbp, %rbp
jz .Lskip_fixup
/* /*
* Fixup the kernel text+data virtual addresses. Note that * Fixup the kernel text+data virtual addresses. Note that
* we might write invalid pmds, when the kernel is relocated * we might write invalid pmds, when the kernel is relocated
@ -149,9 +152,9 @@ startup_64:
* beyond _end. * beyond _end.
*/ */
leaq level2_kernel_pgt(%rip), %rdi leaq level2_kernel_pgt(%rip), %rdi
leaq 4096(%rdi), %r8 leaq PAGE_SIZE(%rdi), %r8
/* See if it is a valid page table entry */ /* See if it is a valid page table entry */
1: testb $1, 0(%rdi) 1: testb $_PAGE_PRESENT, 0(%rdi)
jz 2f jz 2f
addq %rbp, 0(%rdi) addq %rbp, 0(%rdi)
/* Go to the next page */ /* Go to the next page */
@ -162,6 +165,7 @@ startup_64:
/* Fixup phys_base */ /* Fixup phys_base */
addq %rbp, phys_base(%rip) addq %rbp, phys_base(%rip)
.Lskip_fixup:
movq $(early_level4_pgt - __START_KERNEL_map), %rax movq $(early_level4_pgt - __START_KERNEL_map), %rax
jmp 1f jmp 1f
ENTRY(secondary_startup_64) ENTRY(secondary_startup_64)