Merge "Revert "X86: Use locked add rather than mfence"" am: 1c70f18dce
am: 0c5b98362d

* commit '0c5b98362da92d6cfcdffdd6e289ad116be5401b':
  Revert "X86: Use locked add rather than mfence"