Merge "Revert "Revert "X86: Use locked add rather than mfence"""
am: 570a920d0a

* commit '570a920d0a4a01e159a1be46609ff3db4aedc221':
  Revert "Revert "X86: Use locked add rather than mfence""