Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 636aab5c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f6818b9

arch/x86_64/kernel/setup64.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -223,13 +223,6 @@ void __cpuinit cpu_init (void) 
	asm volatile("lidt %0" :: "m" (idt_descr));

	asm volatile("lidt %0" :: "m" (idt_descr));





	memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);

	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();

	syscall_init();





	wrmsrl(MSR_FS_BASE, 0);

	wrmsrl(MSR_FS_BASE, 0);