Message ID | 1529362784-14194-3-git-send-email-leitao@debian.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | [v2,1/4] powerpc/tm: Remove msr_tm_active() | expand |
On Mon, 2018-06-18 at 19:59 -0300, Breno Leitao wrote: > From: Cyril Bur <cyrilbur@gmail.com> > > tm_reclaim_thread() doesn't use the parameter anymore, both callers have > to bother getting it as they have no need for a struct thread_info > either. > > It was previously used but became unused in commit > dc3106690b20 ("powerpc: tm: Always use fp_state and vr_state to store live > registers") > > Just remove it and adjust the callers. > > Signed-off-by: Cyril Bur <cyrilbur@gmail.com> > Signed-off-by: Breno Leitao <leitao@debian.org> Acked-by: Michael Neuling <mikey@neuling.org.> > --- > arch/powerpc/kernel/process.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c > index 9ef4aea9fffe..f8beee03f00a 100644 > --- a/arch/powerpc/kernel/process.c > +++ b/arch/powerpc/kernel/process.c > @@ -866,8 +866,7 @@ static inline bool tm_enabled(struct task_struct *tsk) > return tsk && tsk->thread.regs && (tsk->thread.regs->msr & MSR_TM); > } > > -static void tm_reclaim_thread(struct thread_struct *thr, > - struct thread_info *ti, uint8_t cause) > +static void tm_reclaim_thread(struct thread_struct *thr, uint8_t cause) > { > /* > * Use the current MSR TM suspended bit to track if we have > @@ -914,7 +913,7 @@ static void tm_reclaim_thread(struct thread_struct *thr, > void tm_reclaim_current(uint8_t cause) > { > tm_enable(); > - tm_reclaim_thread(¤t->thread, current_thread_info(), cause); > + tm_reclaim_thread(¤t->thread, cause); > } > > static inline void tm_reclaim_task(struct task_struct *tsk) > @@ -945,7 +944,7 @@ static inline void tm_reclaim_task(struct task_struct > *tsk) > thr->regs->ccr, thr->regs->msr, > thr->regs->trap); > > - tm_reclaim_thread(thr, task_thread_info(tsk), TM_CAUSE_RESCHED); > + tm_reclaim_thread(thr, TM_CAUSE_RESCHED); > > TM_DEBUG("--- tm_reclaim on pid %d complete\n", > tsk->pid);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 9ef4aea9fffe..f8beee03f00a 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -866,8 +866,7 @@ static inline bool tm_enabled(struct task_struct *tsk) return tsk && tsk->thread.regs && (tsk->thread.regs->msr & MSR_TM); } -static void tm_reclaim_thread(struct thread_struct *thr, - struct thread_info *ti, uint8_t cause) +static void tm_reclaim_thread(struct thread_struct *thr, uint8_t cause) { /* * Use the current MSR TM suspended bit to track if we have @@ -914,7 +913,7 @@ static void tm_reclaim_thread(struct thread_struct *thr, void tm_reclaim_current(uint8_t cause) { tm_enable(); - tm_reclaim_thread(¤t->thread, current_thread_info(), cause); + tm_reclaim_thread(¤t->thread, cause); } static inline void tm_reclaim_task(struct task_struct *tsk) @@ -945,7 +944,7 @@ static inline void tm_reclaim_task(struct task_struct *tsk) thr->regs->ccr, thr->regs->msr, thr->regs->trap); - tm_reclaim_thread(thr, task_thread_info(tsk), TM_CAUSE_RESCHED); + tm_reclaim_thread(thr, TM_CAUSE_RESCHED); TM_DEBUG("--- tm_reclaim on pid %d complete\n", tsk->pid);