diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/numa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 195bfcd08959..eb505ad34a85 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -528,12 +528,10 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start, | |||
528 | /* | 528 | /* |
529 | * We use lmb_end_of_DRAM() in here instead of memory_limit because | 529 | * We use lmb_end_of_DRAM() in here instead of memory_limit because |
530 | * we've already adjusted it for the limit and it takes care of | 530 | * we've already adjusted it for the limit and it takes care of |
531 | * having memory holes below the limit. | 531 | * having memory holes below the limit. Also, in the case of |
532 | * iommu_is_off, memory_limit is not set but is implicitly enforced. | ||
532 | */ | 533 | */ |
533 | 534 | ||
534 | if (! memory_limit) | ||
535 | return size; | ||
536 | |||
537 | if (start + size <= lmb_end_of_DRAM()) | 535 | if (start + size <= lmb_end_of_DRAM()) |
538 | return size; | 536 | return size; |
539 | 537 | ||