Browse Source

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 <mingo@kernel.org>
Signed-off-by: Michal Hocko <mhocko@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/1460541432-21631-1-git-send-email-mhocko@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Michal Hocko 9 years ago
parent
commit
00fb16e26a
1 changed files with 2 additions and 0 deletions
  1. 2 0
      arch/x86/lib/rwsem.S

+ 2 - 0
arch/x86/lib/rwsem.S

@@ -107,10 +107,12 @@ ENTRY(call_rwsem_down_write_failed)
 ENDPROC(call_rwsem_down_write_failed)
 ENDPROC(call_rwsem_down_write_failed)
 
 
 ENTRY(call_rwsem_down_write_failed_killable)
 ENTRY(call_rwsem_down_write_failed_killable)
+	FRAME_BEGIN
 	save_common_regs
 	save_common_regs
 	movq %rax,%rdi
 	movq %rax,%rdi
 	call rwsem_down_write_failed_killable
 	call rwsem_down_write_failed_killable
 	restore_common_regs
 	restore_common_regs
+	FRAME_END
 	ret
 	ret
 ENDPROC(call_rwsem_down_write_failed_killable)
 ENDPROC(call_rwsem_down_write_failed_killable)