diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-02-13 16:58:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-13 16:58:11 -0800 |
| commit | 27e6672bb9912d3e3a41cf88e6142d3ae5e534b3 (patch) | |
| tree | f2c84845f8e2c43b0871322acc96295def395d51 | |
| parent | eea89e13a9c61d3928223d2f9bf2295e22e0efb6 (diff) | |
| download | linux-27e6672bb9912d3e3a41cf88e6142d3ae5e534b3.tar.gz linux-27e6672bb9912d3e3a41cf88e6142d3ae5e534b3.tar.bz2 linux-27e6672bb9912d3e3a41cf88e6142d3ae5e534b3.zip | |
[LMB]: Fix initial lmb add region with a non-zero base
If we add to an empty lmb region with a non-zero base we will not
coalesce the number of regions down to one. This causes problems on
ppc32 for the memory region as its assumed to only have one region.
We can fix this be easily specially casing the initial add to just
replace the dummy region.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | lib/lmb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/lmb.c b/lib/lmb.c index 6390d63a2a0e..e34a9e586c42 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -134,6 +134,12 @@ static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base, unsigned long coalesced = 0; long adjacent, i; + if ((rgn->cnt == 1) && (rgn->region[0].size == 0)) { + rgn->region[0].base = base; + rgn->region[0].size = size; + return 0; + } + /* First try and coalesce this LMB with another. */ for (i=0; i < rgn->cnt; i++) { unsigned long rgnbase = rgn->region[i].base; |