patch-2.1.36 linux/arch/sparc64/mm/init.c

• Lines: 127
• Date: Tue Apr 22 22:39:12 1997
• Orig file: v2.1.35/linux/arch/sparc64/mm/init.c
• Orig date: Mon Apr 14 16:28:10 1997

diff -u --recursive --new-file v2.1.35/linux/arch/sparc64/mm/init.c linux/arch/sparc64/mm/init.c
@@ -1,4 +1,4 @@
-/*  $Id: init.c,v 1.22 1997/04/12 04:28:48 davem Exp $
+/*  $Id: init.c,v 1.24 1997/04/17 21:49:41 jj Exp $
  *  arch/sparc64/mm/init.c
  *
  *  Copyright (C) 1996,1997 David S. Miller (davem@caip.rutgers.edu)
@@ -32,6 +32,9 @@
 
 unsigned long tlb_context_cache = CTX_FIRST_VERSION;
 
+/* References to section boundaries */
+extern char __init_begin, __init_end, etext, __p1275_loc, __bss_start;
+
 /*
  * BAD_PAGE is the page that is used for page faults when linux
  * is out-of-memory. Older versions of linux just did a
@@ -268,6 +271,7 @@
 
 char *mmu_info(void)
 {
+	/* XXX */
 	return "MMU Type: Spitfire\n\tFIXME: Write this\n";
 }
 
@@ -436,15 +440,6 @@
 	else
 		pte = mk_pte_phys(physaddr, __pgprot(pg_iobits | __DIRTY_BITS));
 
-#if 0
-	prom_printf("IOMAP: vaddr[%016lx]paddr[%016lx]ptep[%016lx]pte[%016lx])\n",
-		    virt_addr, physaddr, (unsigned long) ptep, pte_val(pte));
-	prom_printf("IOMAP: pgd[%016lx,%016lx]\n",
-		    (unsigned long) pgdp, pgd_val(*pgdp));
-	prom_printf("IOMAP: pmd[%016lx,%016lx]\n",
-		    (unsigned long) pmdp, pmd_val(*pmdp));
-#endif
-
 	set_pte(ptep, pte);
 }
 
@@ -462,6 +457,7 @@
 	pte_clear(ptep);
 }
 
+#ifdef DEBUG_MMU
 void sparc_ultra_dump_itlb(void)
 {
         int slot;
@@ -485,6 +481,7 @@
         		slot+1, spitfire_get_dtlb_tag(slot+1), spitfire_get_dtlb_data(slot+1));
         }
 }
+#endif
 
 /* paging_init() sets up the page tables */
 
@@ -493,7 +490,6 @@
 __initfunc(unsigned long 
 paging_init(unsigned long start_mem, unsigned long end_mem))
 {
-	extern unsigned long __p1275_loc;
 	extern unsigned long phys_base;
 	extern void setup_tba(unsigned long kpgdir);
 	extern void __bfill64(void *, unsigned long);
@@ -637,9 +633,10 @@
 {
 	int codepages = 0;
 	int datapages = 0;
+	int initpages = 0;
+	int prompages = 0;
 	unsigned long tmp2, addr;
 	unsigned long data_end;
-	extern char etext;
 
 	end_mem &= PAGE_MASK;
 	max_mapnr = MAP_NR(end_mem);
@@ -665,6 +662,10 @@
 		if(PageReserved(mem_map + MAP_NR(addr))) {
 			if ((addr < (unsigned long) &etext) && (addr >= PAGE_OFFSET))
 				codepages++;
+			else if((addr >= (unsigned long)&__init_begin && addr < (unsigned long)&__init_end))
+				initpages++;
+			else if((addr >= (unsigned long)&__p1275_loc && addr < (unsigned long)&__bss_start))
+				prompages++;
 			else if((addr < data_end) && (addr >= PAGE_OFFSET))
 				datapages++;
 			continue;
@@ -680,26 +681,23 @@
 
 	tmp2 = nr_free_pages << PAGE_SHIFT;
 
-	printk("Memory: %luk available (%dk kernel code, %dk data) [%016lx,%016lx]\n",
+	printk("Memory: %luk available (%dk kernel code, %dk data, %dk init, %dk prom) [%016lx,%016lx]\n",
 	       tmp2 >> 10,
 	       codepages << (PAGE_SHIFT-10),
-	       datapages << (PAGE_SHIFT-10), PAGE_OFFSET, end_mem);
+	       datapages << (PAGE_SHIFT-10), 
+	       initpages << (PAGE_SHIFT-10), 
+	       prompages << (PAGE_SHIFT-10), 
+	       PAGE_OFFSET, end_mem);
 
 	min_free_pages = nr_free_pages >> 7;
 	if(min_free_pages < 16)
 		min_free_pages = 16;
 	free_pages_low = min_free_pages + (min_free_pages >> 1);
 	free_pages_high = min_free_pages + min_free_pages;
-
-#if 0
-	printk("Done in mem_init() halting\n");
-	prom_cmdline();
-#endif
 }
 
 void free_initmem (void)
 {
-	extern char __init_begin, __init_end;
 	unsigned long addr;
 	
 	addr = (unsigned long)(&__init_begin);
@@ -708,7 +706,6 @@
 		atomic_set(&mem_map[MAP_NR(addr)].count, 1);
 		free_page(addr);
 	}
-	printk ("Freeing unused kernel memory: %dk freed\n", (unsigned)((&__init_end - &__init_begin) >> 10));
 }
 
 void si_meminfo(struct sysinfo *val)