diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
commit | 151aeab77738469ddbf0f9532e2fddd0d231aa2b (patch) | |
tree | cb1320931d458aeecd1d504575c62ad554a3417a /arch/x86/include/asm/thread_info.h | |
parent | 17de4ee04ca925590df036b112c1db8a778e14bf (diff) | |
parent | 024c9d2faebdad3fb43fe49ad68e91a36190f1e2 (diff) |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/thread_info.h')
-rw-r--r-- | arch/x86/include/asm/thread_info.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 5161da1a0fa0..89e7eeb5cec1 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -158,17 +158,6 @@ struct thread_info { */ #ifndef __ASSEMBLY__ -static inline unsigned long current_stack_pointer(void) -{ - unsigned long sp; -#ifdef CONFIG_X86_64 - asm("mov %%rsp,%0" : "=g" (sp)); -#else - asm("mov %%esp,%0" : "=g" (sp)); -#endif - return sp; -} - /* * Walks up the stack frames to make sure that the specified object is * entirely contained by a single stack frame. |