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

* commit '65b5183b0ae0042ab917eb8afd4f236669c3935d':
  Revert "Revert "X86: Use locked add rather than mfence""