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

Commit 369101da authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Thomas Gleixner
Browse files

x86: head_64.S cleanup - use predefined flags from processor-flags.h 



We should better use already defined flags from processor-flags.h instead
of defining own ones

[>>> object code check >>>]

original
md5sum: 9cfa6dbf045a046bb5dfb85f8bcfe8c4  arch/x86/kernel/head_64.o
   text    data     bss     dec     hex filename
  37361    4432    8192   49985    c341 arch/x86/kernel/head_64.o

patched
md5sum: 9cfa6dbf045a046bb5dfb85f8bcfe8c4  arch/x86/kernel/head_64.o
   text    data     bss     dec     hex filename
  37361    4432    8192   49985    c341 arch/x86/kernel/head_64.o

[<<< object code check <<<]

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9831bfb2

arch/x86/kernel/head_64.S

+5 −8
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/page.h>

#include <asm/msr.h>

#include <asm/cache.h>

#include <asm/processor-flags.h>



#ifdef CONFIG_PARAVIRT

#include <asm/asm-offsets.h>
@@ -184,14 +185,10 @@ ENTRY(secondary_startup_64) 
1:	wrmsr				/* Make changes effective */



	/* Setup cr0 */

#define CR0_PM				1		/* protected mode */

#define CR0_MP				(1<<1)

#define CR0_ET				(1<<4)

#define CR0_NE				(1<<5)

#define CR0_WP				(1<<16)

#define CR0_AM				(1<<18)

#define CR0_PAGING 			(1<<31)

	movl $CR0_PM|CR0_MP|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PAGING,%eax

#define CR0_STATE	(X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \

			 X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \

			 X86_CR0_PG)

	movl	$CR0_STATE, %eax

	/* Make changes effective */

	movq	%rax, %cr0