diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-24 14:44:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-24 15:57:31 -0400 |
commit | dca5b52ad76b10c3adc29e2a006d4b1721c44a8d (patch) | |
tree | b79f6b022a0a69d60db1cd001b8284c1eb74bce0 /arch/x86/kernel | |
parent | f9d71854b4fe9b22ca199c4676da5a6ece1e5c17 (diff) |
x86/asm/entry/64: Rename THREAD_INFO() to ASM_THREAD_INFO()
The THREAD_INFO() macro has a somewhat confusingly generic name,
defined in a generic .h C header file. It also does not make it
clear that it constructs a memory operand for use in assembly
code.
Rename it to ASM_THREAD_INFO() to make it all glaringly
obvious on first glance.
Acked-by: Borislav Petkov <bp@suse.de>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/20150324184442.GC14760@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 8f01a4f1cf9e..daf5d94c0e78 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -249,7 +249,7 @@ GLOBAL(system_call_after_swapgs) | |||
249 | pushq_cfi_reg r11 /* pt_regs->r11 */ | 249 | pushq_cfi_reg r11 /* pt_regs->r11 */ |
250 | sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */ | 250 | sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */ |
251 | 251 | ||
252 | testl $_TIF_WORK_SYSCALL_ENTRY, THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) | 252 | testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) |
253 | jnz tracesys | 253 | jnz tracesys |
254 | system_call_fastpath: | 254 | system_call_fastpath: |
255 | #if __SYSCALL_MASK == ~0 | 255 | #if __SYSCALL_MASK == ~0 |
@@ -267,7 +267,7 @@ system_call_fastpath: | |||
267 | * Has incompletely filled pt_regs, iret frame is also incomplete. | 267 | * Has incompletely filled pt_regs, iret frame is also incomplete. |
268 | */ | 268 | */ |
269 | ret_from_sys_call: | 269 | ret_from_sys_call: |
270 | testl $_TIF_ALLWORK_MASK, THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) | 270 | testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS) |
271 | jnz int_ret_from_sys_call /* Go the slow path */ | 271 | jnz int_ret_from_sys_call /* Go the slow path */ |
272 | 272 | ||
273 | LOCKDEP_SYS_EXIT | 273 | LOCKDEP_SYS_EXIT |