lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix included-by file reference comments
  x86, cpu: Only CPU features determine NX capabilities
  x86, cpu: Call verify_cpu during 32bit CPU startup
  x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
  x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
This commit is contained in:
Linus Torvalds
2011-01-06 10:56:02 -08:00
parent 017892c341 79250af2d5
commit 37d9a8c5ea
5 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ no_longmode:
hlt
jmp 1b
#include "../../kernel/verify_cpu_64.S"
#include "../../kernel/verify_cpu.S"
/*
* Be careful here startup_64 needs to be at a predictable