am a47dcbf4: Merge "x86_64: Fix issues in entrypoints"

* commit 'a47dcbf4bc226b5bbf30618fc052e7c79672af7a':
  x86_64: Fix issues in entrypoints