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

* commit '523e21d366523604576b85960d7aba6062fd5605':
  Fail-proof the inline directives for SMP atomic operations.