On Monday 07 August 2006 09:32 am, Adrian Bunk wrote:
> On Sun, Aug 06, 2006 at 10:21:29PM -0700, Andrew Morton wrote:
> > On Sun, 6 Aug 2006 23:30:19 -0400
> What about the patch below that adds a timespec_to_us() to time.h and
> uses this function in kernel/tsacct.c?
>
>
> <-- snip -->
>
>
> This patch adds a timespec_to_us() to include/linux/time.h and uses it
> to fix a compile error in kernel/tsacct.c .
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
>
> include/linux/time.h | 12 ++++++++++++
> kernel/tsacct.c | 2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> --- linux-2.6.18-rc3-mm2-full/include/linux/time.h.old 2006-08-06
> 19:56:50.000000000 +0200 +++
> linux-2.6.18-rc3-mm2-full/include/linux/time.h 2006-08-06
> 20:00:51.000000000 +0200 @@ -132,6 +132,18 @@
> }
>
> /**
> + * timespec_to_us - Convert timespec to microseconds
> + * @ts: pointer to the timespec variable to be converted
> + *
> + * Returns the scalar microsecond representation of the timespec
> + * parameter.
> + */
> +static inline s64 timespec_to_us(const struct timespec *ts)
> +{
> + return ((s64) ts->tv_sec * USEC_PER_SEC) + ts->tv_nsec / NSEC_PER_USEC;
> +}
> +
> +/**
> * timeval_to_ns - Convert timeval to nanoseconds
> * @ts: pointer to the timeval variable to be converted
> *
> --- linux-2.6.18-rc3-mm2-full/kernel/tsacct.c.old 2006-08-06
> 19:54:45.000000000 +0200 +++
> linux-2.6.18-rc3-mm2-full/kernel/tsacct.c 2006-08-06 19:56:44.000000000
> +0200 @@ -36,7 +36,7 @@
> do_posix_clock_monotonic_gettime(&uptime);
> ts = timespec_sub(uptime, current->group_leader->start_time);
> /* rebase elapsed time to usec */
> - stats->ac_etime = (timespec_to_ns(&ts))/NSEC_PER_USEC;
> + stats->ac_etime = timespec_to_us(&ts);
> stats->ac_btime = xtime.tv_sec - ts.tv_sec;
> if (thread_group_leader(tsk)) {
> stats->ac_exitcode = tsk->exit_code;
This patch also compiles for me without errors.
Matt
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
