aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/relocate_kernel_32.S5
-rw-r--r--arch/x86/kernel/relocate_kernel_64.S3
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
index a7ecc8e0bc6..c30fe25d470 100644
--- a/arch/x86/kernel/relocate_kernel_32.S
+++ b/arch/x86/kernel/relocate_kernel_32.S
@@ -10,14 +10,15 @@
10#include <asm/page.h> 10#include <asm/page.h>
11#include <asm/kexec.h> 11#include <asm/kexec.h>
12#include <asm/processor-flags.h> 12#include <asm/processor-flags.h>
13#include <asm/pgtable.h>
13 14
14/* 15/*
15 * Must be relocatable PIC code callable as a C function 16 * Must be relocatable PIC code callable as a C function
16 */ 17 */
17 18
18#define PTR(x) (x << 2) 19#define PTR(x) (x << 2)
19#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ 20#define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
20#define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */ 21#define PAE_PGD_ATTR (_PAGE_PRESENT)
21 22
22 .text 23 .text
23 .align PAGE_SIZE 24 .align PAGE_SIZE
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 0c93a945b32..f5afe665a82 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -10,13 +10,14 @@
10#include <asm/page.h> 10#include <asm/page.h>
11#include <asm/kexec.h> 11#include <asm/kexec.h>
12#include <asm/processor-flags.h> 12#include <asm/processor-flags.h>
13#include <asm/pgtable.h>
13 14
14/* 15/*
15 * Must be relocatable PIC code callable as a C function 16 * Must be relocatable PIC code callable as a C function
16 */ 17 */
17 18
18#define PTR(x) (x << 3) 19#define PTR(x) (x << 3)
19#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */ 20#define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
20 21
21 .text 22 .text
22 .align PAGE_SIZE 23 .align PAGE_SIZE