Merge branch 'mp/hipe-smp-fixes' into ccase/r13b04_dev

* mp/hipe-smp-fixes:
  work around hipe_mfa_info_table lock omission
  fix hipe loader SMP non-atomicity error

OTP-8397  The loading of native code was not properly atomic in the SMP
          emulator, which could cause crashes. Also a per-MFA information
          table for the native code has now been protected with a lock
          since it turns that it could be accessed concurrently in the SMP
          emulator. (Thanks to Mikael Pettersson.)

1 files changed, 8 insertions, 5 deletions

diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 25f1d420d1..2f2924ae76 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2005-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 
@@ -75,6 +75,9 @@ static erts_lc_lock_order_t erts_lock_order[] = {
      *						 the lock name)"
      */
 #ifdef ERTS_SMP
+#ifdef HIPE
+    {	"hipe_mfait_lock",			NULL			},
+#endif
     {	"driver_lock",				"driver_name"		},
     {	"port_lock",				"port_id"		},
 #endif