Skip to content

Commit

Permalink
timer: Avoid using timespec
Browse files Browse the repository at this point in the history
The tstats_show() function prints a ktime_t variable by converting
it to struct timespec first. The algorithm is ok, but we want to
stop using timespec in general because of the 32-bit time_t
overflow problem.

This changes the code to use struct timespec64, without any
functional change.

Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
  • Loading branch information
arndb authored and johnstultz-work committed Jun 20, 2016
1 parent 4a19bd3 commit 7c71feb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/time/timer_stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ static void print_name_offset(struct seq_file *m, unsigned long addr)

static int tstats_show(struct seq_file *m, void *v)
{
struct timespec period;
struct timespec64 period;
struct entry *entry;
unsigned long ms;
long events = 0;
Expand All @@ -295,11 +295,11 @@ static int tstats_show(struct seq_file *m, void *v)

time = ktime_sub(time_stop, time_start);

period = ktime_to_timespec(time);
period = ktime_to_timespec64(time);
ms = period.tv_nsec / 1000000;

seq_puts(m, "Timer Stats Version: v0.3\n");
seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
seq_printf(m, "Sample period: %ld.%03ld s\n", (long)period.tv_sec, ms);
if (atomic_read(&overflow_count))
seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
Expand Down

0 comments on commit 7c71feb

Please sign in to comment.