aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 16:42:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 22:01:11 -0500
commit636aab5ce332d88a76362797a55804c7da643467 (patch)
tree6127968732ba695e30d72f3dfd53252c18ec89ec
parent1f6818b90dbb887261c616a318733703ed526f0a (diff)
[PATCH] x86_64: No need to remove NT during CPU setup
head.S already clears EFLAGS completely. Following an i386 patch from Zachary Amsden. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/setup64.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 06dc354375c3..7b7131d8bc90 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -223,13 +223,6 @@ void __cpuinit cpu_init (void)
223 asm volatile("lidt %0" :: "m" (idt_descr)); 223 asm volatile("lidt %0" :: "m" (idt_descr));
224 224
225 memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8); 225 memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);
226
227 /*
228 * Delete NT
229 */
230
231 asm volatile("pushfq ; popq %%rax ; btr $14,%%rax ; pushq %%rax ; popfq" ::: "eax");
232
233 syscall_init(); 226 syscall_init();
234 227
235 wrmsrl(MSR_FS_BASE, 0); 228 wrmsrl(MSR_FS_BASE, 0);