Prev: perf top: set perf_event_attr->pmu_id
Next: power/ds2760_battery: make charge_now and charge_full_design writeable
From: Benjamin Herrenschmidt on 10 May 2010 06:00
This will be used by the array resize code and might prove useful
to some arch code as well at which point it can be made non-static.

Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
---
lib/lmb.c | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/lmb.c b/lib/lmb.c
index 141d4ab..95ef5b6 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -366,20 +366,7 @@ phys_addr_t __init lmb_alloc(phys_addr_t size, phys_addr_t align)
return lmb_alloc_base(size, align, LMB_ALLOC_ACCESSIBLE);
}

-phys_addr_t __init lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
-{
- phys_addr_t alloc;
-
- alloc = __lmb_alloc_base(size, align, max_addr);
-
- if (alloc == 0)
- panic("ERROR: Failed to allocate 0x%llx bytes below 0x%llx.\n",
- (unsigned long long) size, (unsigned long long) max_addr);
-
- return alloc;
-}
-
-phys_addr_t __init __lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
+static phys_addr_t __init lmb_find_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
{
long i;
phys_addr_t base = 0;
@@ -405,13 +392,37 @@ phys_addr_t __init __lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_ad
continue;
base = min(lmbbase + lmbsize, max_addr);
res_base = lmb_find_region(lmbbase, base, size, align);
- if (res_base != LMB_ERROR &&
- lmb_add_region(&lmb.reserved, res_base, size) >= 0)
+ if (res_base != LMB_ERROR)
return res_base;
}
return 0;
}

+phys_addr_t __init __lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
+{
+ phys_addr_t found = lmb_find_base(size, align, max_addr);
+
+ if (found != LMB_ERROR &&
+ lmb_add_region(&lmb.reserved, found, size) >= 0)
+ return found;
+
+ return 0;
+}
+
+phys_addr_t __init lmb_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
+{
+ phys_addr_t alloc;
+
+ alloc = __lmb_alloc_base(size, align, max_addr);
+
+ if (alloc == 0)
+ panic("ERROR: Failed to allocate 0x%llx bytes below 0x%llx.\n",
+ (unsigned long long) size, (unsigned long long) max_addr);
+
+ return alloc;
+}
+
+
/* You must call lmb_analyze() before this. */
phys_addr_t __init lmb_phys_mem_size(void)
{
--
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: perf top: set perf_event_attr->pmu_id
Next: power/ds2760_battery: make charge_now and charge_full_design writeable