Commit 288621e3 authored Mar 21, 2008 by Cyrill Gorcunov Committed by Ingo Molnar Apr 17, 2008

x86: relocate_kernel - use predefined PAGE_SIZE instead of own alias



This patch does clean up relocate_kernel_(32|64).S a bit by getting rid
of local PAGE_ALIGNED macro. We should use well-known PAGE_SIZE instead

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 89bda4fc

arch/x86/kernel/relocate_kernel_32.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,12 +15,11 @@
		*/

		#define PTR(x) (x << 2)
		#define PAGE_ALIGNED (1 << PAGE_SHIFT)
		#define PAGE_ATTR 0x63 /* _PAGE_PRESENT\|_PAGE_RW\|_PAGE_ACCESSED\|_PAGE_DIRTY */
		#define PAE_PGD_ATTR 0x01 /* _PAGE_PRESENT */

		.text
		.align PAGE_ALIGNED
		.align PAGE_SIZE
		.globl relocate_kernel
		relocate_kernel:
		movl 8(%esp), %ebp /* list of pages */

arch/x86/kernel/relocate_kernel_64.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		*/

		#define PTR(x) (x << 3)
		#define PAGE_ALIGNED (1 << PAGE_SHIFT)
		#define PAGE_ATTR 0x63 /* _PAGE_PRESENT\|_PAGE_RW\|_PAGE_ACCESSED\|_PAGE_DIRTY */

		.text
		.align PAGE_ALIGNED
		.align PAGE_SIZE
		.code64
		.globl relocate_kernel
		relocate_kernel: