Commit e83e31f4 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Thomas Gleixner

x86: compressed/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: 129f24be6df396fb7d8bf998c01fc716  arch/x86/boot/compressed/head_64.o
   text    data     bss     dec     hex filename
    705      48   45056   45809    b2f1 arch/x86/boot/compressed/head_64.o

patched
md5sum: 129f24be6df396fb7d8bf998c01fc716  arch/x86/boot/compressed/head_64-new.o
   text    data     bss     dec     hex filename
    705      48   45056   45809    b2f1 arch/x86/boot/compressed/head_64-new.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 369101da
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/boot.h> #include <asm/boot.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/processor-flags.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
.section ".text.head" .section ".text.head"
...@@ -109,7 +110,7 @@ startup_32: ...@@ -109,7 +110,7 @@ startup_32:
/* Enable PAE mode */ /* Enable PAE mode */
xorl %eax, %eax xorl %eax, %eax
orl $(1 << 5), %eax orl $(X86_CR4_PAE), %eax
movl %eax, %cr4 movl %eax, %cr4
/* /*
...@@ -170,7 +171,7 @@ startup_32: ...@@ -170,7 +171,7 @@ startup_32:
pushl %eax pushl %eax
/* Enter paged protected Mode, activating Long Mode */ /* Enter paged protected Mode, activating Long Mode */
movl $0x80000001, %eax /* Enable Paging and Protected mode */ movl $(X86_CR0_PG | X86_CR0_PE), %eax /* Enable Paging and Protected mode */
movl %eax, %cr0 movl %eax, %cr0
/* Jump from 32bit compatibility mode into 64bit mode. */ /* Jump from 32bit compatibility mode into 64bit mode. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment