svn commit: r205533 - projects/ppc64/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Tue Mar 23 19:58:20 2010
New Revision: 205533
URL: http://svn.freebsd.org/changeset/base/205533

Log:
  Fix a mismerge: lock the OFW mutex before disabling exceptions, not
  afterward. There be dragons...

Modified:
  projects/ppc64/sys/powerpc/aim/ofw_machdep.c

Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Tue Mar 23 19:44:59 2010	(r205532)
+++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c	Tue Mar 23 19:58:20 2010	(r205533)
@@ -378,6 +378,8 @@ openfirmware(void *args)
 	u_int		i;
 	#endif
 
+	mtx_lock(&ofw_mutex);
+
 	/*
 	 * Turn off exceptions - we really don't want to end up
 	 * anywhere unexpected with PCPU set to something strange,
@@ -385,8 +387,6 @@ openfirmware(void *args)
 	 */
 	oldmsr = intr_disable();
 
-	mtx_lock(&ofw_mutex);
-
 	ofw_sprg_prepare();
 
       #ifndef __powerpc64__