---

yaml --- r: 116945 b: refs/heads/master c: fe55249 h: refs/heads/master i: 116943: 9aa2475 v: v3
git-mirror · Oct 21, 2008 · 8600e17 · 8600e17
1 parent d60ff8c
commit 8600e17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a75a6b8e85e92cc774d42a4e113c76c30b5a539
+refs/heads/master: fe55249d17f7979cf9bbc58e38e9ceaf1918b415
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
@@ -528,12 +528,10 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
 	/*
 	 * We use lmb_end_of_DRAM() in here instead of memory_limit because
 	 * we've already adjusted it for the limit and it takes care of
-	 * having memory holes below the limit.
+	 * having memory holes below the limit.  Also, in the case of
+	 * iommu_is_off, memory_limit is not set but is implicitly enforced.
 	 */
 
-	if (! memory_limit)
-		return size;
-
 	if (start + size <= lmb_end_of_DRAM())
 		return size;