am cafc9480: Merge "Fix addition of extra arg to cfi_restore."

* commit 'cafc948069d447aa1e4dde599ee83bf6c0c5d5d8':
  Fix addition of extra arg to cfi_restore.
This commit is contained in:
Christopher Ferris 2015-04-15 00:22:59 +00:00 committed by Android Git Automerger
commit 4a9e3d76a5

@ -52,15 +52,15 @@ ENTRY(syscall)
# Restore the callee save registers.
pop %ebp
.cfi_adjust_cfa_offset -4
.cfi_restore ebp, 0
.cfi_restore ebp
pop %edi
.cfi_adjust_cfa_offset -4
.cfi_restore edi, 0
.cfi_restore edi
pop %esi
.cfi_adjust_cfa_offset -4
.cfi_restore esi, 0
.cfi_restore esi
pop %ebx
.cfi_adjust_cfa_offset -4
.cfi_restore ebx, 0
.cfi_restore ebx
ret
END(syscall)