From 16cb509db5acca92b407a7ffd2969fe08ae0d405 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <michael.frysinger@analog.com>
Date: Thu, 12 Jul 2007 12:20:20 +0800
Subject: [PATCH] --- yaml --- r: 58851 b: refs/heads/master c:
 520473b0775ce046d179afa686fb3222884c389d h: refs/heads/master i:   58849:
 71c136b6fdfbe3c4a4188506608400841baf9bea   58847:
 8d89f0305b110c0454b2fb86d131e4d8f03066a6 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/blackfin/kernel/vmlinux.lds.S | 12 +++++++-----
 trunk/include/asm-blackfin/page.h        |  4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bba2f901a0a0..0cb1d5f032ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b07af760c9bd8e87c3aa9275298566379ec4e9c1
+refs/heads/master: 520473b0775ce046d179afa686fb3222884c389d
diff --git a/trunk/arch/blackfin/kernel/vmlinux.lds.S b/trunk/arch/blackfin/kernel/vmlinux.lds.S
index 1ef1e36b3957..d06f860f4790 100644
--- a/trunk/arch/blackfin/kernel/vmlinux.lds.S
+++ b/trunk/arch/blackfin/kernel/vmlinux.lds.S
@@ -31,6 +31,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/mem_map.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-bfin")
 ENTRY(__start)
@@ -63,8 +64,8 @@ SECTIONS
 
 	.data :
 	{
+		. = ALIGN(PAGE_SIZE);
 		__sdata = .;
-		. = ALIGN(0x2000);
 		*(.data.init_task)
 		DATA_DATA
 		CONSTRUCTORS
@@ -72,14 +73,14 @@ SECTIONS
 		. = ALIGN(32);
 		*(.data.cacheline_aligned)
 
-		. = ALIGN(0x2000);
+		. = ALIGN(PAGE_SIZE);
 		__edata = .;
 	}
 
+	. = ALIGN(PAGE_SIZE);
 	___init_begin = .;
 	.init :
 	{
-		. = ALIGN(4096);
 		__sinittext = .;
 		*(.init.text)
 		__einittext = .;
@@ -152,9 +153,10 @@ SECTIONS
 		__ebss_b_l1 = .;
 	}
 
-	___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+	. = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+	___init_end = ALIGN(PAGE_SIZE);
 
-	.bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :
+	.bss ___init_end :
 	{
 		. = ALIGN(4);
 		___bss_start = .;
diff --git a/trunk/include/asm-blackfin/page.h b/trunk/include/asm-blackfin/page.h
index ffad947f1b2a..8bc86717021c 100644
--- a/trunk/include/asm-blackfin/page.h
+++ b/trunk/include/asm-blackfin/page.h
@@ -4,7 +4,11 @@
 /* PAGE_SHIFT determines the page size */
 
 #define PAGE_SHIFT	12
+#ifdef __ASSEMBLY__
+#define PAGE_SIZE	(1 << PAGE_SHIFT)
+#else
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#endif
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
 #ifdef __KERNEL__