linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / mm / lmb.c

diff --git a/arch/powerpc/mm/lmb.c b/arch/powerpc/mm/lmb.c
index 716a290..bbe3eac 100644 (file)
--- a/arch/powerpc/mm/lmb.c
+++ b/arch/powerpc/mm/lmb.c
@@ -10,6 +10,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
@@ -30,8 +31,6 @@
 #define DBG(fmt...)
 #endif
 
-#define LMB_ALLOC_ANYWHERE     0
-
 struct lmb lmb;
 
 void lmb_dump_all(void)
@@ -88,23 +87,18 @@ static long __init lmb_regions_adjacent(struct lmb_region *rgn,
        return lmb_addrs_adjacent(base1, size1, base2, size2);
 }
 
-static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
-{
-       unsigned long i;
-
-       for (i = r; i < rgn->cnt - 1; i++) {
-               rgn->region[i].base = rgn->region[i + 1].base;
-               rgn->region[i].size = rgn->region[i + 1].size;
-       }
-       rgn->cnt--;
-}
-
 /* Assumption: base addr of region 1 < base addr of region 2 */
 static void __init lmb_coalesce_regions(struct lmb_region *rgn,
                unsigned long r1, unsigned long r2)
 {
+       unsigned long i;
+
        rgn->region[r1].size += rgn->region[r2].size;
-       lmb_remove_region(rgn, r2);
+       for (i=r2; i < rgn->cnt-1; i++) {
+               rgn->region[i].base = rgn->region[i+1].base;
+               rgn->region[i].size = rgn->region[i+1].size;
+       }
+       rgn->cnt--;
 }
 
 /* This routine called with relocation disabled. */
@@ -231,20 +225,6 @@ unsigned long __init lmb_alloc(unsigned long size, unsigned long align)
 
 unsigned long __init lmb_alloc_base(unsigned long size, unsigned long align,
                                    unsigned long max_addr)
-{
-       unsigned long alloc;
-
-       alloc = __lmb_alloc_base(size, align, max_addr);
-
-       if (alloc == 0)
-               panic("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
-                               size, max_addr);
-
-       return alloc;
-}
-
-unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
-                                   unsigned long max_addr)
 {
        long i, j;
        unsigned long base = 0;
@@ -298,16 +278,17 @@ unsigned long __init lmb_end_of_DRAM(void)
        return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
 }
 
-/* You must call lmb_analyze() after this. */
+/*
+ * Truncate the lmb list to memory_limit if it's set
+ * You must call lmb_analyze() after this.
+ */
 void __init lmb_enforce_memory_limit(unsigned long memory_limit)
 {
        unsigned long i, limit;
-       struct lmb_property *p;
 
        if (! memory_limit)
                return;
 
-       /* Truncate the lmb regions to satisfy the memory limit. */
        limit = memory_limit;
        for (i = 0; i < lmb.memory.cnt; i++) {
                if (limit > lmb.memory.region[i].size) {
@@ -319,22 +300,4 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit)
                lmb.memory.cnt = i + 1;
                break;
        }
-
-       if (lmb.memory.region[0].size < lmb.rmo_size)
-               lmb.rmo_size = lmb.memory.region[0].size;
-
-       /* And truncate any reserves above the limit also. */
-       for (i = 0; i < lmb.reserved.cnt; i++) {
-               p = &lmb.reserved.region[i];
-
-               if (p->base > memory_limit)
-                       p->size = 0;
-               else if ((p->base + p->size) > memory_limit)
-                       p->size = memory_limit - p->base;
-
-               if (p->size == 0) {
-                       lmb_remove_region(&lmb.reserved, i);
-                       i--;
-               }
-       }
 }