am 8addd1f1: am 65e3b69b: Merge "Move modify_ldt_lock into global lock order."

* commit '8addd1f198c456255e171a9f6effd7400e5fa2d2':
  Move modify_ldt_lock into global lock order.