On Fri, Jan 11, 2008 at 08:58:35PM -0500, Steven Rostedt wrote: > > > Hmm, I think this was caused by Paul's patch: > > http://lkml.org/lkml/2007/12/13/5 > > I'll apply this too, unless Paul sees any reason not to. They look good to me -- apologies for the hassle, Robert! Thanx, Paul > -- Steve > > > On Sat, 12 Jan 2008, Robert Schwebel wrote: > > > Fix the following compile error for powerpc32: > > > > arch/powerpc/kernel/process.c: In function '__switch_to': > > arch/powerpc/kernel/process.c:355: error: 'per_cpu__ppc64_tlb_batch' undeclared (first use in this function) > > > > Not sure what the code actually does, but as it was not there in -rc5, > > somebody else might find something ... > > > > Signed-off-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx> > > > > --- > > arch/powerpc/kernel/process.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > Index: linux-2.6.24-rc7/arch/powerpc/kernel/process.c > > =================================================================== > > --- linux-2.6.24-rc7.orig/arch/powerpc/kernel/process.c > > +++ linux-2.6.24-rc7/arch/powerpc/kernel/process.c > > @@ -267,10 +267,10 @@ struct task_struct *__switch_to(struct t > > struct thread_struct *new_thread, *old_thread; > > unsigned long flags; > > struct task_struct *last; > > -#ifdef CONFIG_PREEMPT_RT > > +#if defined(CONFIG_PPC64) && defined (CONFIG_PREEMPT_RT) > > struct ppc64_tlb_batch *batch; > > int hadbatch; > > -#endif /* #ifdef CONFIG_PREEMPT_RT */ > > +#endif > > > > #ifdef CONFIG_SMP > > /* avoid complexity of lazy save/restore of fpu > > @@ -349,7 +349,6 @@ struct task_struct *__switch_to(struct t > > old_thread->accum_tb += (current_tb - start_tb); > > new_thread->start_tb = current_tb; > > } > > -#endif > > > > #ifdef CONFIG_PREEMPT_RT > > batch = &__get_cpu_var(ppc64_tlb_batch); > > @@ -361,6 +360,7 @@ struct task_struct *__switch_to(struct t > > batch->active = 0; > > } > > #endif /* #ifdef CONFIG_PREEMPT_RT */ > > +#endif > > > > local_irq_save(flags); > > > > @@ -372,12 +372,12 @@ struct task_struct *__switch_to(struct t > > > > local_irq_restore(flags); > > > > -#ifdef CONFIG_PREEMPT_RT > > +#if defined(CONFIG_PPC64) && defined(CONFIG_PREEMPT_RT) > > if (hadbatch) { > > batch = &__get_cpu_var(ppc64_tlb_batch); > > batch->active = 1; > > } > > -#endif /* #ifdef CONFIG_PREEMPT_RT */ > > +#endif > > > > return last; > > } > > - To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
