aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-01-14 20:01:42 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-22 22:02:51 -0500
commit10ea834364c8670b3bf9bbbf6b9d27b4d2ebc9de (patch)
tree7457dc5f11df1a782585a65b81900875983838cf
parented77d4182ba9c5c5ab1b28728ae1ce750d575dfa (diff)
powerpc: Rename _TIF_SYSCALL_T_OR_A to _TIF_SYSCALL_DOTRACE
Once upon a time, at least 9 years ago (< 2.6.12), _TIF_SYSCALL_T_OR_A meant "TRACE or AUDIT". But these days it means TRACE or AUDIT or SECCOMP or TRACEPOINT or NOHZ. All of those are implemented via syscall_dotrace() so rename the flag to that to try and clarify things. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/include/asm/thread_info.h2
-rw-r--r--arch/powerpc/kernel/entry_32.S6
-rw-r--r--arch/powerpc/kernel/entry_64.S6
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index ebc4f165690a..c1efa05613f0 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -124,7 +124,7 @@ static inline struct thread_info *current_thread_info(void)
124#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT) 124#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
125#define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE) 125#define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
126#define _TIF_NOHZ (1<<TIF_NOHZ) 126#define _TIF_NOHZ (1<<TIF_NOHZ)
127#define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ 127#define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
128 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \ 128 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
129 _TIF_NOHZ) 129 _TIF_NOHZ)
130 130
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 10a093579191..da6379550fd2 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -337,7 +337,7 @@ _GLOBAL(DoSyscall)
337#endif /* CONFIG_TRACE_IRQFLAGS */ 337#endif /* CONFIG_TRACE_IRQFLAGS */
338 CURRENT_THREAD_INFO(r10, r1) 338 CURRENT_THREAD_INFO(r10, r1)
339 lwz r11,TI_FLAGS(r10) 339 lwz r11,TI_FLAGS(r10)
340 andi. r11,r11,_TIF_SYSCALL_T_OR_A 340 andi. r11,r11,_TIF_SYSCALL_DOTRACE
341 bne- syscall_dotrace 341 bne- syscall_dotrace
342syscall_dotrace_cont: 342syscall_dotrace_cont:
343 cmplwi 0,r0,NR_syscalls 343 cmplwi 0,r0,NR_syscalls
@@ -364,7 +364,7 @@ ret_from_syscall:
364 MTMSRD(r10) 364 MTMSRD(r10)
365 lwz r9,TI_FLAGS(r12) 365 lwz r9,TI_FLAGS(r12)
366 li r8,-_LAST_ERRNO 366 li r8,-_LAST_ERRNO
367 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) 367 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
368 bne- syscall_exit_work 368 bne- syscall_exit_work
369 cmplw 0,r3,r8 369 cmplw 0,r3,r8
370 blt+ syscall_exit_cont 370 blt+ syscall_exit_cont
@@ -501,7 +501,7 @@ syscall_exit_work:
501 subi r12,r12,TI_FLAGS 501 subi r12,r12,TI_FLAGS
502 502
5034: /* Anything which requires enabling interrupts? */ 5034: /* Anything which requires enabling interrupts? */
504 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) 504 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP)
505 beq ret_from_except 505 beq ret_from_except
506 506
507 /* Re-enable interrupts. There is no need to trace that with 507 /* Re-enable interrupts. There is no need to trace that with
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 194e46dcf08d..3291ed148bdf 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -151,7 +151,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
151#endif 151#endif
152 CURRENT_THREAD_INFO(r11, r1) 152 CURRENT_THREAD_INFO(r11, r1)
153 ld r10,TI_FLAGS(r11) 153 ld r10,TI_FLAGS(r11)
154 andi. r11,r10,_TIF_SYSCALL_T_OR_A 154 andi. r11,r10,_TIF_SYSCALL_DOTRACE
155 bne syscall_dotrace 155 bne syscall_dotrace
156.Lsyscall_dotrace_cont: 156.Lsyscall_dotrace_cont:
157 cmpldi 0,r0,NR_syscalls 157 cmpldi 0,r0,NR_syscalls
@@ -214,7 +214,7 @@ syscall_exit:
214 214
215 ld r9,TI_FLAGS(r12) 215 ld r9,TI_FLAGS(r12)
216 li r11,-_LAST_ERRNO 216 li r11,-_LAST_ERRNO
217 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK) 217 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP|_TIF_USER_WORK_MASK|_TIF_PERSYSCALL_MASK)
218 bne- syscall_exit_work 218 bne- syscall_exit_work
219 cmpld r3,r11 219 cmpld r3,r11
220 ld r5,_CCR(r1) 220 ld r5,_CCR(r1)
@@ -307,7 +307,7 @@ syscall_exit_work:
307 307
3084: /* Anything else left to do? */ 3084: /* Anything else left to do? */
309 SET_DEFAULT_THREAD_PPR(r3, r10) /* Set thread.ppr = 3 */ 309 SET_DEFAULT_THREAD_PPR(r3, r10) /* Set thread.ppr = 3 */
310 andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) 310 andi. r0,r9,(_TIF_SYSCALL_DOTRACE|_TIF_SINGLESTEP)
311 beq ret_from_except_lite 311 beq ret_from_except_lite
312 312
313 /* Re-enable interrupts */ 313 /* Re-enable interrupts */