Commit 366932de authored Mar 23, 2008 by gorcunov@gmail.com Committed by Ingo Molnar Apr 17, 2008

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>

parent fd3af531

arch/x86/kernel/relocate_kernel_32.S

+3 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/kernel/relocate_kernel_64.S

+2 −1

Original line number	Diff line number	Diff line
		@@ -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