Merge "X86: Use locked add rather than mfence" am: c3ca1e6543
am: 1279e0f901

* commit '1279e0f9013bc0e395b424e13d7f42c2180570a5':
  X86: Use locked add rather than mfence