From: Tim Abbott <tabbott@ksplice.com>
Date: Sun, 18 Oct 2009 17:23:49 +0000 (-0400)
Subject: m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f4bed4fb17417085d00e4fd1dc285db0330e5945;p=deliverable%2Flinux.git

m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 6e10d25f872d..a0108fd6d341 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -8,6 +8,7 @@
  */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 #if defined(CONFIG_RAMKERNEL)
 #define	RAM_START	CONFIG_KERNELBASE
@@ -155,7 +156,7 @@ SECTIONS {
 	} > DATA
 
 	.init : {
-		. = ALIGN(4096);
+		. = ALIGN(PAGE_SIZE);
 		__init_begin = .;
 		_sinittext = .;
 		INIT_TEXT
@@ -180,7 +181,7 @@ SECTIONS {
 		*(.init.ramfs)
 		__initramfs_end = .;
 #endif
-		. = ALIGN(4096);
+		. = ALIGN(PAGE_SIZE);
 		__init_end = .;
 	} > INIT