[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>

diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 06dc354375c3fa684e5d7cbe16e74ec69a4a16f5..7b7131d8bc908509cf411509744b83d1013b3a4f 100644 (file)
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -223,13 +223,6 @@ void __cpuinit cpu_init (void)
        asm volatile("lidt %0" :: "m" (idt_descr));
 
        memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);
-
-       /*
-        * Delete NT
-        */
-
-       asm volatile("pushfq ; popq %%rax ; btr $14,%%rax ; pushq %%rax ; popfq" ::: "eax");
-
        syscall_init();
 
        wrmsrl(MSR_FS_BASE, 0);