diff --git a/[refs] b/[refs]
index 67fd0dca9b25..6d339eed04ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d4d5a8a83e4a564bcf233fdd565183c33df5d1
+refs/heads/master: ae86f0088de389baa448a42d040ab58d5c759bef
diff --git a/trunk/arch/powerpc/mm/hash_utils_64.c b/trunk/arch/powerpc/mm/hash_utils_64.c
index 2f3dfcc7cdd3..2b5a399f6fa6 100644
--- a/trunk/arch/powerpc/mm/hash_utils_64.c
+++ b/trunk/arch/powerpc/mm/hash_utils_64.c
@@ -192,6 +192,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
 	return ret < 0 ? ret : 0;
 }
 
+#ifdef CONFIG_MEMORY_HOTPLUG
 static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
 		      int psize, int ssize)
 {
@@ -212,6 +213,7 @@ static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
 
 	return 0;
 }
+#endif /* CONFIG_MEMORY_HOTPLUG */
 
 static int __init htab_dt_scan_seg_sizes(unsigned long node,
 					 const char *uname, int depth,