svn commit: r202403 - in stable/7/sys/sparc64: conf sparc64

[Marius Strobl]

Author: marius
Date: Fri Jan 15 16:55:00 2010
New Revision: 202403
URL: http://svn.freebsd.org/changeset/base/202403

Log:
  MFC: r201396, r201410
  
  - Demapping unused kernel TLB slots has proven to work reliably so move
    the associated debugging under bootverbose.
  - Remove freebsd4_sigreturn(); given that FreeBSD 4 didn't supported
    sparc64 this only ever served as a transition aid prior to FreeBSD
    5.0 and is unused by default since COMPAT_FREEBSD4 was removed from
    GENERIC in r143072 nearly 5 years ago.

Modified:
  stable/7/sys/sparc64/conf/NOTES
  stable/7/sys/sparc64/sparc64/machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/sparc64/conf/NOTES
==============================================================================
--- stable/7/sys/sparc64/conf/NOTES	Fri Jan 15 16:54:59 2010	(r202402)
+++ stable/7/sys/sparc64/conf/NOTES	Fri Jan 15 16:55:00 2010	(r202403)
@@ -131,6 +131,7 @@ nodevice	ex
 # Options we don't want to deal with
 
 nooption	FDC_DEBUG
+nooption	COMPAT_FREEBSD4
 nooption	SC_RENDER_DEBUG
 nooption	SC_DEBUG_LEVEL
 nooption	PPC_DEBUG

Modified: stable/7/sys/sparc64/sparc64/machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/machdep.c	Fri Jan 15 16:54:59 2010	(r202402)
+++ stable/7/sys/sparc64/sparc64/machdep.c	Fri Jan 15 16:55:00 2010	(r202403)
@@ -375,8 +375,9 @@ sparc64_init(caddr_t mdp, u_long o1, u_l
 	 */
 	for (va = KERNBASE + (kernel_tlb_slots - 1) * PAGE_SIZE_4M;
 	    va >= roundup2(end, PAGE_SIZE_4M); va -= PAGE_SIZE_4M) {
-		printf("demapping unused kernel TLB slot (va %#lx - %#lx)\n",
-		    va, va + PAGE_SIZE_4M - 1);
+		if (bootverbose)
+			printf("demapping unused kernel TLB slot "
+			    "(va %#lx - %#lx)\n", va, va + PAGE_SIZE_4M - 1);
 		stxa(TLB_DEMAP_VA(va) | TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE,
 		    ASI_DMMU_DEMAP, 0);
 		stxa(TLB_DEMAP_VA(va) | TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE,
@@ -663,15 +664,6 @@ sigreturn(struct thread *td, struct sigr
 	return (EJUSTRETURN);
 }
 
-#ifdef COMPAT_FREEBSD4
-int
-freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
-{
-
-	return sigreturn(td, (struct sigreturn_args *)uap);
-}
-#endif
-
 /*
  * Construct a PCB from a trapframe. This is called from kdb_trap() where
  * we want to start a backtrace from the function that caused us to enter