am df88a9e4: Merge "x86_64: Enable compilation"

* commit 'df88a9e44673655009cc560947d29c1400516f12':
  x86_64: Enable compilation