From 06dcc207586957c70b0c39b816fc9e5a6a4e2d56 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Fri, 25 Jan 2013 17:13:15 +0000
Subject: [PATCH] --- yaml --- r: 349445 b: refs/heads/master c:
 196897a2979498d19edbdf5b4af02261afbc1a96 h: refs/heads/master i:   349443:
 dcd495faa57bd52bad8a30ce801e0b3cbda5240e v: v3

---
 [refs]                       | 2 +-
 trunk/arch/mips/mm/ioremap.c | 6 ------
 trunk/arch/mips/mm/mmap.c    | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 89fc7d6cea67..f39ffda38c96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26f5ae865d7b324e46fff91acf43c485939bf6ea
+refs/heads/master: 196897a2979498d19edbdf5b4af02261afbc1a96
diff --git a/trunk/arch/mips/mm/ioremap.c b/trunk/arch/mips/mm/ioremap.c
index 7657fd21cd3f..cacfd31e8ec9 100644
--- a/trunk/arch/mips/mm/ioremap.c
+++ b/trunk/arch/mips/mm/ioremap.c
@@ -190,9 +190,3 @@ void __iounmap(const volatile void __iomem *addr)
 
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(__iounmap);
-
-int __virt_addr_valid(const volatile void *kaddr)
-{
-	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
-}
-EXPORT_SYMBOL_GPL(__virt_addr_valid);
diff --git a/trunk/arch/mips/mm/mmap.c b/trunk/arch/mips/mm/mmap.c
index d9be7540a6be..7e5fe2790d8a 100644
--- a/trunk/arch/mips/mm/mmap.c
+++ b/trunk/arch/mips/mm/mmap.c
@@ -192,3 +192,9 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
 
 	return ret;
 }
+
+int __virt_addr_valid(const volatile void *kaddr)
+{
+	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
+}
+EXPORT_SYMBOL_GPL(__virt_addr_valid);