[LV-kern-commit] CVS: kernel-2.4/arch/vax/mm init.c,1.7,1.8

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv23123/arch/vax/mm

Modified Files:
	init.c 
Log Message:
Reorganise tmp_start_kernel. max_pfn/hwpfn fixes. update config file.


Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/mm/init.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- init.c	2001/02/18 12:03:31	1.7
+++ init.c	2001/02/18 16:42:45	1.8
@@ -16,6 +16,7 @@
 
 static unsigned long totalram_pages;
 
+unsigned long max_pfn;		/* number of 4k pfns */
 unsigned long empty_zero_page[PAGE_SIZE /
 			      sizeof(unsigned long)]
     __attribute__ ((__aligned__(PAGE_SIZE)));
@@ -41,7 +42,7 @@
 {
     unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 };
     /* max_pfn is the number of hwptes */
-    zones_size[ZONE_DMA] = max_pfn/8;
+    zones_size[ZONE_DMA] = max_pfn;
     free_area_init(zones_size);
 }
 
@@ -69,12 +70,11 @@
 
 void mem_init(void)
 {
-    max_mapnr = num_physpages = max_low_pfn/8;
+    max_mapnr = num_physpages = max_low_pfn;
 
     /* this will put all low memory onto the freelists */
     totalram_pages += free_all_bootmem();
-asm("halt");
-    high_memory = (void *) __va((max_low_pfn/8) * PAGE_SIZE);
+    high_memory = (void *) __va((max_low_pfn) * PAGE_SIZE);
 
     printk("Memory: %luk/%luk available\n",
 	   (unsigned long) nr_free_pages() << (PAGE_SHIFT-10), max_mapnr << (PAGE_SHIFT-10));