From c9d96b5afc1fed25f9601a978a48aaef8e8e76df Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sat, 18 Mar 2006 19:16:23 -0800
Subject: [PATCH] --- yaml --- r: 21561 b: refs/heads/master c:
 88d7079458f87d6f2d2261b2f87b7b9416019f5e h: refs/heads/master i:   21559:
 35bae16b419c5855c1860caa962bc09af5ad30aa v: v3

---
 [refs]                       |  2 +-
 trunk/arch/sparc64/mm/init.c | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38e5e1f014f2..b232ff39c1f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4006dcf6a8c43bd482b9c1ec576f0ed270ef23
+refs/heads/master: 88d7079458f87d6f2d2261b2f87b7b9416019f5e
diff --git a/trunk/arch/sparc64/mm/init.c b/trunk/arch/sparc64/mm/init.c
index a1a364e537c7..c2b556106fc1 100644
--- a/trunk/arch/sparc64/mm/init.c
+++ b/trunk/arch/sparc64/mm/init.c
@@ -1805,3 +1805,21 @@ void __flush_tlb_all(void)
 	__asm__ __volatile__("wrpr	%0, 0, %%pstate"
 			     : : "r" (pstate));
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+
+void online_page(struct page *page)
+{
+	ClearPageReserved(page);
+	set_page_count(page, 0);
+	free_cold_page(page);
+	totalram_pages++;
+	num_physpages++;
+}
+
+int remove_memory(u64 start, u64 size)
+{
+	return -EINVAL;
+}
+
+#endif /* CONFIG_MEMORY_HOTPLUG */