[LV-kern-commit] CVS: kernel-2.4/include/asm-vax/mm pgalloc.h,1.11,1.12 task.h,1.2,1.3

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

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm
In directory usw-pr-cvs1:/tmp/cvs-serv26817

Modified Files:
	pgalloc.h task.h 
Log Message:
Change task sizes to be more appropriate for gcc. 
Change cache size counter to have separate counters for each cache type,
and fix stupid do_pgt_cache looping bug. pgtable -> pgd cache.


Index: pgalloc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pgalloc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgalloc.h	2001/08/23 09:29:15	1.11
+++ pgalloc.h	2001/09/01 12:22:46	1.12
@@ -35,6 +35,7 @@
 extern struct pgtable_cache_struct {
 	unsigned long *pgd_cache;
    	unsigned long pgd_slots_used;
+        unsigned long pgd_cache_sz;
 	unsigned long *pte_cache;
 	unsigned long pgtable_cache_sz;
 } quicklists;
@@ -48,6 +49,7 @@
 #define pmd_quicklist ((unsigned long *)0)
 #define pte_quicklist (quicklists.pte_cache)
 #define pgtable_cache_size (quicklists.pgtable_cache_sz)
+#define pgd_cache_size (quicklists.pgd_cache_sz)
 #define pgd_slots_used (quicklists.pgd_slots_used)
 
 /*
@@ -63,7 +65,7 @@
 {
 	*(unsigned long *)pgd = (unsigned long) pgd_quicklist;
 	pgd_quicklist = (unsigned long *) pgd;
-	pgtable_cache_size++;
+	pgd_cache_size++;
 }
 
 extern __inline__ void free_pgd_slow(pgd_t *pgd)
@@ -80,7 +82,7 @@
    
            if ((ret = (unsigned long *)pte_quicklist) != NULL) {
 	                      pte_quicklist = (unsigned long *)(*ret);
-	                      ret[0] = ret[1];
+	                      ret[0] = 0;
 	                      pgtable_cache_size--;
 	   }
            return (pmd_t *)ret;
@@ -119,7 +121,7 @@
 
 	if((ret = (unsigned long *)pte_quicklist) != NULL) {
 		pte_quicklist = (unsigned long *)(*ret);
-		ret[0] = ret[1];
+		ret[0] = 0;
 		pgtable_cache_size--;
 	}
 	return (pte_t *)ret;

Index: task.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/task.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- task.h	2001/08/21 20:12:42	1.2
+++ task.h	2001/09/01 12:22:46	1.3
@@ -22,13 +22,13 @@
 /* TASK_MMAPMAX is the max space in P0 for the mmap() function ,
    contiguous with TASK_TXTMAX - Its basically the amount of memory you 
    give a process to play with */
-#define TASK_MMAPMAX	(32*1024*1024) 
+#define TASK_MMAPMAX	(24*1024*1024) 
 
 /* TASK_STKMAX is the max space for the stack in P1 */
 /* Like WSMAX above, the upper limit for this is set by PGD_SPECIAL below. If this 
  * is above 256MB change PGD_SPECIAL 
  */
-#define TASK_STKMAX	(8*1024*1024)
+#define TASK_STKMAX	(16*1024*1024)
 
 #define TASK_WSMAX  (TASK_TXTMAX+TASK_MMAPMAX)