Commit-ID:  00fb16e26ac8559e69c3bb14284f4a548d28ee0d
Gitweb:     http://git.kernel.org/tip/00fb16e26ac8559e69c3bb14284f4a548d28ee0d
Author:     Michal Hocko <[email protected]>
AuthorDate: Wed, 13 Apr 2016 11:57:12 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 22 Apr 2016 08:58:41 +0200

locking/rwsem, x86: Add frame annotation for 
call_rwsem_down_write_failed_killable()

3387a535ce62 ("x86/asm: Create stack frames in rwsem functions") has
added FRAME_{BEGIN,END} annotations to rwsem asm stubs. The patch
which has added call_rwsem_down_write_failed_killable() was based on an
older tree so it didn't know about annotations. Let's add them.

This addresses the following objtool warning:

  arch/x86/lib/rwsem.o: warning: objtool: 
call_rwsem_down_write_failed_killable()+0xe: call without frame pointer 
save/setup

Reported-by: Ingo Molnar <[email protected]>
Signed-off-by: Michal Hocko <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86/lib/rwsem.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
index 4534a7e..a37462a 100644
--- a/arch/x86/lib/rwsem.S
+++ b/arch/x86/lib/rwsem.S
@@ -107,10 +107,12 @@ ENTRY(call_rwsem_down_write_failed)
 ENDPROC(call_rwsem_down_write_failed)
 
 ENTRY(call_rwsem_down_write_failed_killable)
+       FRAME_BEGIN
        save_common_regs
        movq %rax,%rdi
        call rwsem_down_write_failed_killable
        restore_common_regs
+       FRAME_END
        ret
 ENDPROC(call_rwsem_down_write_failed_killable)
 

Reply via email to