X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Fresource.c;h=82aea814d409731e7804d6e553330465d6ab72d9;hb=05dda977f2574c3341abef9b74c27d2b362e1e3a;hp=2eb553d9b517153d8d938b34d60718b948b6bac0;hpb=6e5565f949af1322f8f3d3f43d044645ae448499;p=deliverable%2Flinux.git

diff --git a/kernel/resource.c b/kernel/resource.c
index 2eb553d9b517..82aea814d409 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -228,7 +228,7 @@ int release_resource(struct resource *old)
 
 EXPORT_SYMBOL(release_resource);
 
-#ifdef CONFIG_MEMORY_HOTPLUG
+#if defined(CONFIG_MEMORY_HOTPLUG) && !defined(CONFIG_ARCH_HAS_WALK_MEMORY)
 /*
  * Finds the lowest memory reosurce exists within [res->start.res->end)
  * the caller must specify res->start, res->end, res->flags.