diff --git a/[refs] b/[refs] index 01e6bc5d8c0a..9c995c5f4d28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f6818b90dbb887261c616a318733703ed526f0a +refs/heads/master: 636aab5ce332d88a76362797a55804c7da643467 diff --git a/trunk/arch/x86_64/kernel/setup64.c b/trunk/arch/x86_64/kernel/setup64.c index 06dc354375c3..7b7131d8bc90 100644 --- a/trunk/arch/x86_64/kernel/setup64.c +++ b/trunk/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);