X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lib%2Flmb.c;h=031f0e1ac895289f772fb4bf538626ff065d1106;hb=6121a54d603d03da2da87b10881a30a61a8614a3;hp=49a3c9e01e59d15152660d00847a825c33575d4b;hpb=c23154aab5825fec81d5500c53eaa686646c76b5;p=people%2Fms%2Fu-boot.git

diff --git a/lib/lmb.c b/lib/lmb.c
index 49a3c9e01e..031f0e1ac8 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -236,7 +236,7 @@ long lmb_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size)
 	return lmb_add_region(_rgn, base, size);
 }
 
-long lmb_overlaps_region(struct lmb_region *rgn, phys_addr_t base,
+static long lmb_overlaps_region(struct lmb_region *rgn, phys_addr_t base,
 				phys_size_t size)
 {
 	unsigned long i;
@@ -295,7 +295,10 @@ phys_addr_t __lmb_alloc_base(struct lmb *lmb, phys_size_t size, ulong align, phy
 		if (max_addr == LMB_ALLOC_ANYWHERE)
 			base = lmb_align_down(lmbbase + lmbsize - size, align);
 		else if (lmbbase < max_addr) {
-			base = min(lmbbase + lmbsize, max_addr);
+			base = lmbbase + lmbsize;
+			if (base < lmbbase)
+				base = -1;
+			base = min(base, max_addr);
 			base = lmb_align_down(base - size, align);
 		} else
 			continue;