aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2016-04-13 05:57:12 -0400
committerIngo Molnar <mingo@kernel.org>2016-04-22 02:58:41 -0400
commit00fb16e26ac8559e69c3bb14284f4a548d28ee0d (patch)
tree53a64bf9dad5d996431188d79a071e7c50bb2a0f
parent916633a403702549d37ea353e63a68e5b0dc27ad (diff)
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>
-rw-r--r--arch/x86/lib/rwsem.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
index 4534a7e912f3..a37462a23546 100644
--- a/arch/x86/lib/rwsem.S
+++ b/arch/x86/lib/rwsem.S
@@ -107,10 +107,12 @@ ENTRY(call_rwsem_down_write_failed)
107ENDPROC(call_rwsem_down_write_failed) 107ENDPROC(call_rwsem_down_write_failed)
108 108
109ENTRY(call_rwsem_down_write_failed_killable) 109ENTRY(call_rwsem_down_write_failed_killable)
110 FRAME_BEGIN
110 save_common_regs 111 save_common_regs
111 movq %rax,%rdi 112 movq %rax,%rdi
112 call rwsem_down_write_failed_killable 113 call rwsem_down_write_failed_killable
113 restore_common_regs 114 restore_common_regs
115 FRAME_END
114 ret 116 ret
115ENDPROC(call_rwsem_down_write_failed_killable) 117ENDPROC(call_rwsem_down_write_failed_killable)
116 118