1 files changed, 49 insertions, 3 deletions

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 1539a8362b6f..513993414747 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -42,6 +42,7 @@
 #include <asm/sections.h>
 #include <asm/tsb.h>
 #include <asm/hypervisor.h>
+#include <asm/prom.h>
 
 extern void device_scan(void);
 
@@ -101,8 +102,6 @@ static void __init read_obp_memory(const char *property,
                 prom_halt();
         }
 
-        *num_ents = ents;
-
         /* Sanitize what we got from the firmware, by page aligning
          * everything.
          */
@@ -124,6 +123,25 @@ static void __init read_obp_memory(const char *property,
                 regs[i].phys_addr = base;
                 regs[i].reg_size = size;
         }
+
+        for (i = 0; i < ents; i++) {
+                if (regs[i].reg_size == 0UL) {
+                        int j;
+
+                        for (j = i; j < ents - 1; j++) {
+                                regs[j].phys_addr =
+                                        regs[j+1].phys_addr;
+                                regs[j].reg_size =
+                                        regs[j+1].reg_size;
+                        }
+
+                        ents--;
+                        i--;
+                }
+        }
+
+        *num_ents = ents;
+
         sort(regs, ents, sizeof(struct linux_prom64_registers),
              cmp_p64, NULL);
 }
@@ -1339,6 +1357,8 @@ void __init paging_init(void)
 
         kernel_physical_mapping_init();
 
+        prom_build_devicetree();
+
         {
                 unsigned long zones_size[MAX_NR_ZONES];
                 unsigned long zholes_size[MAX_NR_ZONES];
@@ -1376,7 +1396,7 @@ static void __init taint_real_pages(void)
                 while (old_start < old_end) {
                         int n;
 
-                        for (n = 0; pavail_rescan_ents; n++) {
+                        for (n = 0; n < pavail_rescan_ents; n++) {
                                 unsigned long new_start, new_end;
 
                                 new_start = pavail_rescan[n].phys_addr;
@@ -1398,6 +1418,32 @@ static void __init taint_real_pages(void)
         }
 }
 
+int __init page_in_phys_avail(unsigned long paddr)
+{
+        int i;
+
+        paddr &= PAGE_MASK;
+
+        for (i = 0; i < pavail_rescan_ents; i++) {
+                unsigned long start, end;
+
+                start = pavail_rescan[i].phys_addr;
+                end = start + pavail_rescan[i].reg_size;
+
+                if (paddr >= start && paddr < end)
+                        return 1;
+        }
+        if (paddr >= kern_base && paddr < (kern_base + kern_size))
+                return 1;
+#ifdef CONFIG_BLK_DEV_INITRD
+        if (paddr >= __pa(initrd_start) &&
+            paddr < __pa(PAGE_ALIGN(initrd_end)))
+                return 1;
+#endif
+
+        return 0;
+}
+
 void __init mem_init(void)
 {
         unsigned long codepages, datapages, initpages;