diff options
-rw-r--r-- | arch/x86/kernel/relocate_kernel_32.S | 3 | ||||
-rw-r--r-- | arch/x86/kernel/relocate_kernel_64.S | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S index f151d6fae462..ec4e6a0e0c2e 100644 --- a/arch/x86/kernel/relocate_kernel_32.S +++ b/arch/x86/kernel/relocate_kernel_32.S | |||
@@ -15,12 +15,11 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define PTR(x) (x << 2) | 17 | #define PTR(x) (x << 2) |
18 | #define PAGE_ALIGNED (1 << PAGE_SHIFT) | ||
19 | #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ | 18 | #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ |
20 | #define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */ | 19 | #define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */ |
21 | 20 | ||
22 | .text | 21 | .text |
23 | .align PAGE_ALIGNED | 22 | .align PAGE_SIZE |
24 | .globl relocate_kernel | 23 | .globl relocate_kernel |
25 | relocate_kernel: | 24 | relocate_kernel: |
26 | movl 8(%esp), %ebp /* list of pages */ | 25 | movl 8(%esp), %ebp /* list of pages */ |
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index 14e95872c6a3..e252c0ed9539 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S | |||
@@ -15,11 +15,10 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define PTR(x) (x << 3) | 17 | #define PTR(x) (x << 3) |
18 | #define PAGE_ALIGNED (1 << PAGE_SHIFT) | ||
19 | #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ | 18 | #define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ |
20 | 19 | ||
21 | .text | 20 | .text |
22 | .align PAGE_ALIGNED | 21 | .align PAGE_SIZE |
23 | .code64 | 22 | .code64 |
24 | .globl relocate_kernel | 23 | .globl relocate_kernel |
25 | relocate_kernel: | 24 | relocate_kernel: |