3 files changed, 7 insertions, 36 deletions

diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h
index 7e09f7011370..0fdf5d043f82 100644
--- a/arch/xtensa/include/asm/pgtable.h
+++ b/arch/xtensa/include/asm/pgtable.h
@@ -419,14 +419,6 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 extern  void update_mmu_cache(struct vm_area_struct * vma,
                               unsigned long address, pte_t *ptep);
 
-/*
- * remap a physical page `pfn' of size `size' with page protection `prot'
- * into virtual address `from'
- */
-
-#define io_remap_pfn_range(vma,from,pfn,size,prot) \
-        remap_pfn_range(vma, from, pfn, size, prot)
-
 typedef pte_t *pte_addr_t;
 
 #endif /* !defined (__ASSEMBLY__) */
diff --git a/arch/xtensa/include/uapi/asm/socket.h b/arch/xtensa/include/uapi/asm/socket.h
index a8f44f50e651..b21ace4fc9ba 100644
--- a/arch/xtensa/include/uapi/asm/socket.h
+++ b/arch/xtensa/include/uapi/asm/socket.h
@@ -85,4 +85,6 @@
 
 #define SO_SELECT_ERR_QUEUE     45
 
+#define SO_LL                   46
+
 #endif  /* _XTENSA_SOCKET_H */
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index bba125b4bb06..479d7537a32a 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -173,39 +173,16 @@ void __init zones_init(void)
 
 void __init mem_init(void)
 {
-        unsigned long codesize, reservedpages, datasize, initsize;
-        unsigned long highmemsize, tmp, ram;
-
-        max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;
+        max_mapnr = max_low_pfn - ARCH_PFN_OFFSET;
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
-        highmemsize = 0;
 
 #ifdef CONFIG_HIGHMEM
 #error HIGHGMEM not implemented in init.c
 #endif
 
-        totalram_pages += free_all_bootmem();
-
-        reservedpages = ram = 0;
-        for (tmp = 0; tmp < max_mapnr; tmp++) {
-                ram++;
-                if (PageReserved(mem_map+tmp))
-                        reservedpages++;
-        }
+        free_all_bootmem();
 
-        codesize =  (unsigned long) _etext - (unsigned long) _stext;
-        datasize =  (unsigned long) _edata - (unsigned long) _sdata;
-        initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
-
-        printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, "
-               "%ldk data, %ldk init %ldk highmem)\n",
-               nr_free_pages() << (PAGE_SHIFT-10),
-               ram << (PAGE_SHIFT-10),
-               codesize >> 10,
-               reservedpages << (PAGE_SHIFT-10),
-               datasize >> 10,
-               initsize >> 10,
-               highmemsize >> 10);
+        mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -214,11 +191,11 @@ extern int initrd_is_mapped;
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
         if (initrd_is_mapped)
-                free_reserved_area(start, end, 0, "initrd");
+                free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif
 
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }