Date: Tue, 23 Mar 2010 19:58:20 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r205533 - projects/ppc64/sys/powerpc/aim Message-ID: <201003231958.o2NJwK9w072293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003231958.o2NJwK9w072293>