PERFORCE change 140147 for review

Marcel Moolenaar marcel at FreeBSD.org
Thu Apr 17 01:49:50 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=140147

Change 140147 by marcel at marcel_xcllnt on 2008/04/17 01:49:29

	More merge botches...

Affected files ...

.. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 edit

Differences ...

==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#5 (text+ko) ====

@@ -894,18 +894,6 @@
 	kernel_pmap->pm_active = ~0;
 
 	pmap_cpu_bootstrap(trace, 0);
-	/*
-	 * Initialize hardware.
-	 */
-	for (i = 0; i < 16; i++) {
-		mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT);
-	}
-	__asm __volatile ("mtsr %0,%1"
-	    :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT));
-	__asm __volatile ("mtsr %0,%1"
-	    :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT));
-	__asm __volatile ("sync; mtsdr1 %0; isync"
-	    :: "r"((u_int)moea_pteg_table | (moea_pteg_mask >> 10)));
 	tlbia();
 
 	pmap_bootstrapped++;
@@ -917,12 +905,6 @@
 	virtual_end = VM_MAX_KERNEL_ADDRESS;
 
 	/*
-	 * Set the start and end of kva.
-	 */
-	virtual_avail = VM_MIN_KERNEL_ADDRESS;
-	virtual_end = VM_MAX_KERNEL_ADDRESS;
-
-	/*
 	 * Allocate a kernel stack with a guard page for thread0 and map it
 	 * into the kernel page map.
 	 */


More information about the p4-projects mailing list