am daf3aa92: am 7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"

* commit 'daf3aa92a273dceaf40051c8402fefd7a8b0e6c5':
  x86_64: Clean-up after cmp-long fix