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

* commit '1c70f18dce7705ff70147ddebf65a97f66df8d5c':
  Revert "X86: Use locked add rather than mfence"