svn commit: r190040 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Thu Mar 19 13:11:02 2009
New Revision: 190040
URL: http://svn.freebsd.org/changeset/base/190040

Log:
  MFC: r182769

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/sparc64/sparc64/machdep.c
  stable/7/sys/sparc64/sparc64/mp_machdep.c

Modified: stable/7/sys/sparc64/sparc64/machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/machdep.c	Thu Mar 19 13:09:53 2009	(r190039)
+++ stable/7/sys/sparc64/sparc64/machdep.c	Thu Mar 19 13:11:02 2009	(r190040)
@@ -374,6 +374,7 @@ sparc64_init(caddr_t mdp, u_long o1, u_l
 	}
 
 	cache_init(pc);
+	cache_enable();
 	uma_set_align(pc->pc_cache.dc_linesize - 1);
 
 	cpu_block_copy = bcopy;

Modified: stable/7/sys/sparc64/sparc64/mp_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/mp_machdep.c	Thu Mar 19 13:09:53 2009	(r190039)
+++ stable/7/sys/sparc64/sparc64/mp_machdep.c	Thu Mar 19 13:11:02 2009	(r190040)
@@ -381,6 +381,7 @@ cpu_mp_bootstrap(struct pcpu *pc)
 	csa = &cpu_start_args;
 	if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
 		cheetah_init();
+	cache_enable();
 	pmap_map_tsb();
 	/*
 	 * Flush all non-locked TLB entries possibly left over by the