On Thu Oct 6, 2022 at 10:18 PM AEST, Sven Schnelle wrote:
> Nicholas Piggin <npiggin@xxxxxxxxx> writes:
>
> > cputime_t was a core kernel type, removed by commits
> > ed5c8c854f2b..b672592f0221. As explained in commit b672592f0221
> > ("sched/cputime: Remove generic asm headers"), the final cleanup is for
> > the arch to provide cputime_to_nsec[s](). Commit e53051e757d6
> > ("s390/cputime: provide archicture specific cputime_to_nsecs") did that,
> > but just didn't remove the then-unused cputime_to_usecs() and associated
> > remnants.
> >
> > Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
> > ---
> > Sorry this isn't build or compile tested, I'm doing the same for powerpc
> > then we can remove the cputime_to_nsecs fallback from core code too.
>
> I just tested this, looks good. Thanks!
>
> Reviewed-by: Sven Schnelle <svens@xxxxxxxxxxxxx>
Thanks Sven. I think the core code fallback can be removed independently
of this s390 change, so it can go via s390 tree in your own good time.
Thanks,
Nick
>
> >
> > arch/s390/include/asm/cputime.h | 15 ---------------
> > 1 file changed, 15 deletions(-)
> >
> > diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
> > index 1d389847b588..7f9284e2a7db 100644
> > --- a/arch/s390/include/asm/cputime.h
> > +++ b/arch/s390/include/asm/cputime.h
> > @@ -11,21 +11,6 @@
> > #include <linux/types.h>
> > #include <asm/timex.h>
> >
> > -#define CPUTIME_PER_USEC 4096ULL
> > -#define CPUTIME_PER_SEC (CPUTIME_PER_USEC * USEC_PER_SEC)
> > -
> > -/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */
> > -
> > -#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new)
> > -
> > -/*
> > - * Convert cputime to microseconds.
> > - */
> > -static inline u64 cputime_to_usecs(const u64 cputime)
> > -{
> > - return cputime >> 12;
> > -}
> > -
> > /*
> > * Convert cputime to nanoseconds.
> > */
