am 4370d3d3: Merge "x86_64: Fix fp-to-core conversion"

* commit '4370d3d3a92b45ac3bdceae0c3059648b0f3fc1d':
  x86_64: Fix fp-to-core conversion