diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 13:56:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-06 13:56:02 -0500 |
| commit | 37d9a8c5ea8fc063841c133fc53cc168ee620762 (patch) | |
| tree | f39b864a636d10bdbda2db2af6f01b69bc6a919c /arch/x86/boot | |
| parent | 017892c341033b3e961e695bc0bf1a815efcf92e (diff) | |
| parent | 79250af2d5953b69380a6319b493862bf4ece972 (diff) | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 52f85a196fa0..35af09d13dc1 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -182,7 +182,7 @@ no_longmode: | |||
| 182 | hlt | 182 | hlt |
| 183 | jmp 1b | 183 | jmp 1b |
| 184 | 184 | ||
| 185 | #include "../../kernel/verify_cpu_64.S" | 185 | #include "../../kernel/verify_cpu.S" |
| 186 | 186 | ||
| 187 | /* | 187 | /* |
| 188 | * Be careful here startup_64 needs to be at a predictable | 188 | * Be careful here startup_64 needs to be at a predictable |