From 2efa53b269ec1e9289a108e1506f53f6f1de440b Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 20 Jan 2010 16:40:48 +0900
Subject: sh: Make 29/32-bit mode check helper generally available.

Presently __in_29bit_mode() is only defined for the PMB case, but
it's also easily derived from the CONFIG_29BIT and CONFIG_32BIT &&
CONFIG_PMB=n cases.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/mm/init.c | 7 -------
 arch/sh/mm/pmb.c  | 5 +++++
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'arch/sh/mm')

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 32ebd1592e63..491d9d5c8e0d 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -338,10 +338,3 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
 
 #endif /* CONFIG_MEMORY_HOTPLUG */
-
-#ifdef CONFIG_PMB
-int __in_29bit_mode(void)
-{
-	return !(ctrl_inl(PMB_PASCR) & PASCR_SE);
-}
-#endif /* CONFIG_PMB */
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index b796b6c021b4..d318fa6caffe 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -436,6 +436,11 @@ int __uses_jump_to_uncached pmb_init(void)
 	return 0;
 }
 
+bool __in_29bit_mode(void)
+{
+        return (__raw_readl(PMB_PASCR) & PASCR_SE) == 0;
+}
+
 static int pmb_seq_show(struct seq_file *file, void *iter)
 {
 	int i;
-- 
cgit v1.2.3