From 84e07a23524cc34f72f1c1dbc6f48fd6808eece2 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Tue, 18 Nov 2008 17:48:22 +0800
Subject: [PATCH] --- yaml --- r: 127059 b: refs/heads/master c:
 cb15e57cc7d68e524f709c9a541b4900df80df16 h: refs/heads/master i:   127057:
 ce306ee7b9f1bb89ccf6fa553a66de077362e582   127055:
 f3cdbda01661be41a0337e67e05e6c4299755611 v: v3

---
 [refs]                                          |  2 +-
 trunk/arch/blackfin/kernel/cplb-nompu/cplbmgr.S | 13 +++++++++----
 trunk/arch/blackfin/kernel/cplbinfo.c           |  7 +------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 96e8f243f4e2..a72aa12ed471 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05a717fbc893c777165b00821b9dcde968a95bcc
+refs/heads/master: cb15e57cc7d68e524f709c9a541b4900df80df16
diff --git a/trunk/arch/blackfin/kernel/cplb-nompu/cplbmgr.S b/trunk/arch/blackfin/kernel/cplb-nompu/cplbmgr.S
index 985f3fc793f6..f4ca76c72394 100644
--- a/trunk/arch/blackfin/kernel/cplb-nompu/cplbmgr.S
+++ b/trunk/arch/blackfin/kernel/cplb-nompu/cplbmgr.S
@@ -629,15 +629,20 @@ ENTRY(_cplb_mgr)
 	RTS;
 ENDPROC(_cplb_mgr)
 
+#ifdef CONFIG_CPLB_SWITCH_TAB_L1
+.section .l1.data
+#else
 .data
-.align 4;
-_page_size_table:
+#endif
+
+ENTRY(_page_size_table)
 .byte4	0x00000400;	/* 1K */
 .byte4	0x00001000;	/* 4K */
 .byte4	0x00100000;	/* 1M */
 .byte4	0x00400000;	/* 4M */
+END(_page_size_table)
 
-.align 4;
-_dcplb_preference:
+ENTRY(_dcplb_preference)
 .byte4	0x00000001;	/* valid bit */
 .byte4	0x00000002;	/* lock bit */
+END(_dcplb_preference)
diff --git a/trunk/arch/blackfin/kernel/cplbinfo.c b/trunk/arch/blackfin/kernel/cplbinfo.c
index dc584fe18e5f..723839da14a1 100644
--- a/trunk/arch/blackfin/kernel/cplbinfo.c
+++ b/trunk/arch/blackfin/kernel/cplbinfo.c
@@ -59,12 +59,7 @@ static char *cplb_print_entry(char *buf, cplb_type type, unsigned int cpu)
 
 #else
 
-static int page_size_table[4] = {
-	0x00000400,		/* 1K */
-	0x00001000,		/* 4K */
-	0x00100000,		/* 1M */
-	0x00400000		/* 4M */
-};
+extern int page_size_table[];
 
 static int cplb_find_entry(unsigned long *cplb_addr,
 			   unsigned long *cplb_data, unsigned long addr,