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

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

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

Modified Files:
	task.h 
Log Message:
Change task.h to more sane defaults for WSMAX and so forth


Index: task.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/task.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- task.h	2001/07/31 17:33:26	1.1
+++ task.h	2001/08/21 20:12:42	1.2
@@ -15,17 +15,22 @@
 /* TASK_WSMAX is the max virtual address space in P0 */
 /* TASK_WSMAX must not be larger than 768MB. In the unlikely event that 
  * you really want to allocate that much to a process, change PGD_SPECIAL below */
-#define TASK_WSMAX      (40*1024*1024)
 
+/* TASK_TXTMAX is the maximum program size, including shared libs */
+#define TASK_TXTMAX     (16*1024*1024)
+
+/* 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) 
+
 /* 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)
 
-/* TASK_MMAPMAX is the max space in P0 for the mmap() function ,
-   contiguous with TASK_WSMAX */
-#define TASK_MMAPMAX	(8*1024*1024) 
+#define TASK_WSMAX  (TASK_TXTMAX+TASK_MMAPMAX)
 
 /* TASK_MAXUPRC is the maximum number of user processes on the system 
  * Think of this like balsetcnt on VMS. 
@@ -38,11 +43,11 @@
  * space during mmap's.
  */
 
-#define TASK_UNMAPPED_BASE   TASK_WSMAX
+#define TASK_UNMAPPED_BASE   TASK_TXTMAX
 
 /* calculations based on the above for the SPT */
 /*  NPTE_TASK = the number of HWPTE's needed to map a process */
-#define N_HWPTE_TASK_P0	  ((TASK_WSMAX+TASK_MMAPMAX)>>PAGELET_SHIFT)
+#define N_HWPTE_TASK_P0	  ((TASK_WSMAX)>>PAGELET_SHIFT)
 #define N_HWPTE_TASK_P1	  ((TASK_STKMAX)>>PAGELET_SHIFT)
 /* There are 4 4096 byte pages in the pmd. = 4x1024 hwptes. */
 #define N_HWPTE_TASK_PMD     ((4*1024)) 
@@ -60,7 +65,8 @@
  
 /* The offsets into page table area from the start of this slot, in bytes */
 #define P0PTE_OFFSET	  (N_HWPTE_TASK_PMD<<2)
-#define P1PTE_OFFSET	  ((N_HWPTE_TASK_P0+N_HWPTE_TASK_PMD)<<2)	
+/* this is the end of the slot, as p1 counts backwards */
+#define P1PTE_OFFSET	  ((N_HWPTE_TASK_P0+N_HWPTE_TASK_P1+N_HWPTE_TASK_PMD)<<2)
 #define P0PMD_OFFSET	  (0)
 #define P1PMD_OFFSET	  (PAGE_SIZE*2)