Commit 288621e3 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

x86: relocate_kernel - use predefined PAGE_SIZE instead of own alias

This patch does clean up relocate_kernel_(32|64).S a bit by getting rid
of local PAGE_ALIGNED macro. We should use well-known PAGE_SIZE instead
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 89bda4fc
...@@ -15,12 +15,11 @@ ...@@ -15,12 +15,11 @@
*/ */
#define PTR(x) (x << 2) #define PTR(x) (x << 2)
#define PAGE_ALIGNED (1 << PAGE_SHIFT)
#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
#define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */ #define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */
.text .text
.align PAGE_ALIGNED .align PAGE_SIZE
.globl relocate_kernel .globl relocate_kernel
relocate_kernel: relocate_kernel:
movl 8(%esp), %ebp /* list of pages */ movl 8(%esp), %ebp /* list of pages */
......
...@@ -15,11 +15,10 @@ ...@@ -15,11 +15,10 @@
*/ */
#define PTR(x) (x << 3) #define PTR(x) (x << 3)
#define PAGE_ALIGNED (1 << PAGE_SHIFT)
#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
.text .text
.align PAGE_ALIGNED .align PAGE_SIZE
.code64 .code64
.globl relocate_kernel .globl relocate_kernel
relocate_kernel: relocate_kernel:
......
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