From 296cd3e8f70f61efe91040fb31dbd0de23c733e4 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 21 Oct 2008 12:37:36 +0900
Subject: [PATCH] --- yaml --- r: 117247 b: refs/heads/master c:
 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a h: refs/heads/master i:   117245:
 ce358b5fc9e70dacddb14d42c865315b43e45dee   117243:
 753b6e5ce43044201909b7eaa3f0add5c912da55   117239:
 13d38b4b3a61d1e63b8ed508ad505dd17f2e2aab   117231:
 ff2a9ce265be5f85d5b79c4dc73098b581e89710   117215:
 79bd32d42069e58dcab67a2269f9d06ed2a4fc3d   117183:
 70be868738adfc434e4f5edd92fc221147019ae9   117119:
 278bf66218788174dfdfbdd3615d28f0a41458b5   116991:
 3bf053d1b61a10caac5e093468b22da1910ed97d   116735:
 93efc13ed82cd876214fd19b3be444f5d0ec4026 v: v3

---
 [refs]                  |  2 +-
 trunk/arch/sh/mm/init.c | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index e66c36680274..b0f6bb7361de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a51413a65f14e8e872d4da21f7a83656c7abb603
+refs/heads/master: 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a
diff --git a/trunk/arch/sh/mm/init.c b/trunk/arch/sh/mm/init.c
index 2a53943924b2..4abf00031dae 100644
--- a/trunk/arch/sh/mm/init.c
+++ b/trunk/arch/sh/mm/init.c
@@ -321,21 +321,4 @@ int memory_add_physaddr_to_nid(u64 addr)
 }
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
-
-#ifdef CONFIG_MEMORY_HOTREMOVE
-int remove_memory(u64 start, u64 size)
-{
-	unsigned long start_pfn = start >> PAGE_SHIFT;
-	unsigned long end_pfn = start_pfn + (size >> PAGE_SHIFT);
-	int ret;
-
-	ret = offline_pages(start_pfn, end_pfn, 120 * HZ);
-	if (unlikely(ret))
-		printk("%s: Failed, offline_pages() == %d\n", __func__, ret);
-
-	return ret;
-}
-EXPORT_SYMBOL_GPL(remove_memory);
-#endif
-
 #endif /* CONFIG_MEMORY_HOTPLUG */