From 8600e17ef9fc809b67e500a71f74acf235c20b20 Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Mon, 20 Oct 2008 15:37:04 +0000 Subject: [PATCH] --- yaml --- r: 116945 b: refs/heads/master c: fe55249d17f7979cf9bbc58e38e9ceaf1918b415 h: refs/heads/master i: 116943: 9aa2475303ea6a5c3892000d8c129450929b6dae v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/numa.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 796a0592baaa..f8c138606bf1 100644 --- 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 index 195bfcd08959..eb505ad34a85 100644 --- 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;