From 46e9d1de117c17c500b6531f3a7c53ffdbef08a8 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Sun, 18 Oct 2009 13:23:49 -0400
Subject: [PATCH] --- yaml --- r: 173531 b: refs/heads/master c:
 f4bed4fb17417085d00e4fd1dc285db0330e5945 h: refs/heads/master i:   173529:
 356c5a43ed7ad4534e8194b291647230819b34ee   173527:
 7597c1a4ea7e0b79ce9c42d86571aec411aba471 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/m68knommu/kernel/vmlinux.lds.S | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 397de047cc0c..67e202408fd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10f204e5ad4e0c72aa007c00cb76c1d5a577032d
+refs/heads/master: f4bed4fb17417085d00e4fd1dc285db0330e5945
diff --git a/trunk/arch/m68knommu/kernel/vmlinux.lds.S b/trunk/arch/m68knommu/kernel/vmlinux.lds.S
index 6e10d25f872d..a0108fd6d341 100644
--- a/trunk/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/trunk/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