am 7f692fe6: am 523e21d3: Merge "Fail-proof the inline directives for SMP atomic operations."

* commit '7f692fe6448049dca2795d7d648615a2dc7a500c':
  Fail-proof the inline directives for SMP atomic operations.