[patch 4/4] x86: relocate_kernel - use predefined macroses for page attributes

gorcunov
2008-03-22T21:04:45Z

[-- Attachment #1: x86-page-attr --]
[-- Type: text/plain, Size: 1591 bytes --]

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

Index: linux-2.6.git/arch/x86/kernel/relocate_kernel_32.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/relocate_kernel_32.S 2008-03-22 22:22:16.000000000 +0300
+++ linux-2.6.git/arch/x86/kernel/relocate_kernel_32.S 2008-03-22 22:22:17.000000000 +0300
@@ -10,14 +10,15 @@
#include <asm/page.h>
#include <asm/kexec.h>
#include <asm/processor-flags.h>
+#include <asm/pgtable.h>

/*
* Must be relocatable PIC code callable as a C function
*/

#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
.align PAGE_SIZE
Index: linux-2.6.git/arch/x86/kernel/relocate_kernel_64.S
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/relocate_kernel_64.S 2008-03-22 22:22:16.000000000 +0300
+++ linux-2.6.git/arch/x86/kernel/relocate_kernel_64.S 2008-03-22 22:22:17.000000000 +0300
@@ -10,13 +10,14 @@
#include <asm/page.h>
#include <asm/kexec.h>
#include <asm/processor-flags.h>
+#include <asm/pgtable.h>

/*
* Must be relocatable PIC code callable as a C function
*/

#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
.align PAGE_SIZE

--