Browse Source

x86: relocate_kernel - use predefined macroses for page attributes

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
gorcunov@gmail.com 17 years ago
parent
commit
366932deb3
2 changed files with 5 additions and 3 deletions
  1. 3 2
      arch/x86/kernel/relocate_kernel_32.S
  2. 2 1
      arch/x86/kernel/relocate_kernel_64.S

+ 3 - 2
arch/x86/kernel/relocate_kernel_32.S

@@ -10,14 +10,15 @@
 #include <asm/page.h>
 #include <asm/page.h>
 #include <asm/kexec.h>
 #include <asm/kexec.h>
 #include <asm/processor-flags.h>
 #include <asm/processor-flags.h>
+#include <asm/pgtable.h>
 
 
 /*
 /*
  * Must be relocatable PIC code callable as a C function
  * Must be relocatable PIC code callable as a C function
  */
  */
 
 
 #define PTR(x) (x << 2)
 #define PTR(x) (x << 2)
-#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
-#define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */
+#define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
+#define PAE_PGD_ATTR (_PAGE_PRESENT)
 
 
 	.text
 	.text
 	.align PAGE_SIZE
 	.align PAGE_SIZE

+ 2 - 1
arch/x86/kernel/relocate_kernel_64.S

@@ -10,13 +10,14 @@
 #include <asm/page.h>
 #include <asm/page.h>
 #include <asm/kexec.h>
 #include <asm/kexec.h>
 #include <asm/processor-flags.h>
 #include <asm/processor-flags.h>
+#include <asm/pgtable.h>
 
 
 /*
 /*
  * Must be relocatable PIC code callable as a C function
  * Must be relocatable PIC code callable as a C function
  */
  */
 
 
 #define PTR(x) (x << 3)
 #define PTR(x) (x << 3)
-#define PAGE_ATTR 0x63 /* _PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY */
+#define PAGE_ATTR (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
 
 
 	.text
 	.text
 	.align PAGE_SIZE
 	.align PAGE_SIZE