Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 May 2002 11:52:27 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 12085 for review
Message-ID:  <200205291852.g4TIqRW69276@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12085

Change 12085 by peter@peter_daintree on 2002/05/29 11:52:10

	Revert changes here.  It was wishful thinking as the
	nested data tlb faults tell me.

Affected files ...

... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#18 edit
... //depot/projects/ia64/sys/ia64/ia64/pmap.c#21 edit

Differences ...

==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#18 (text+ko) ====

@@ -216,7 +216,11 @@
 			 * recording a trapframe.
 			 */
 			ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP,
-			    M_WAITOK, 0ul, ~0ul, PAGE_SIZE, 0ul);
+					  M_WAITOK,
+					  0ul,
+					  256*1024*1024 - 1,
+					  PAGE_SIZE,
+					  256*1024*1024);
 
 			ap_stack = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)ks));
 			ap_pcpu = pc;

==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#21 (text+ko) ====

@@ -716,10 +716,16 @@
 	struct user *up;
 
 	/*
-	 * contigmalloc is no longer needed here.
+	 * Use contigmalloc for user area so that we can use a region
+	 * 7 address for it which makes it impossible to accidentally
+	 * lose when recording a trapframe.
 	 */
-	up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK,
-	    0ul, ~0ul, PAGE_SIZE, 0ul);
+	up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP,
+			  M_WAITOK,
+			  0ul,
+			  256*1024*1024 - 1,
+			  PAGE_SIZE,
+			  256*1024*1024);
 
 	if (up == NULL)
 		panic("pmap_new_proc: could not contigmalloc %d pages\n",
@@ -767,11 +773,16 @@
 	vm_offset_t *ks;
 
 	/*
-	 * Use contigmalloc for the kernel stack so that the pages
-	 * can be used via physical addressing in the exception code.
+	 * Use contigmalloc for user area so that we can use a region
+	 * 7 address for it which makes it impossible to accidentally
+	 * lose when recording a trapframe.
 	 */
-	ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK,
-	    0ul, ~0ul, PAGE_SIZE, 0ul);
+	ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP,
+			  M_WAITOK,
+			  0ul,
+			  256*1024*1024 - 1,
+			  PAGE_SIZE,
+			  256*1024*1024);
 
 	if (ks == NULL)
 		panic("pmap_new_thread: could not contigmalloc %d pages\n",

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205291852.g4TIqRW69276>