diff options
Diffstat (limited to 'kernel/time/timer_stats.c')
-rw-r--r-- | kernel/time/timer_stats.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c index 1fb08f21302e..1adecb4b87c8 100644 --- a/kernel/time/timer_stats.c +++ b/kernel/time/timer_stats.c | |||
@@ -68,7 +68,7 @@ struct entry { | |||
68 | * Number of timeout events: | 68 | * Number of timeout events: |
69 | */ | 69 | */ |
70 | unsigned long count; | 70 | unsigned long count; |
71 | unsigned int timer_flag; | 71 | u32 flags; |
72 | 72 | ||
73 | /* | 73 | /* |
74 | * We save the command-line string to preserve | 74 | * We save the command-line string to preserve |
@@ -227,13 +227,13 @@ static struct entry *tstat_lookup(struct entry *entry, char *comm) | |||
227 | * @startf: pointer to the function which did the timer setup | 227 | * @startf: pointer to the function which did the timer setup |
228 | * @timerf: pointer to the timer callback function of the timer | 228 | * @timerf: pointer to the timer callback function of the timer |
229 | * @comm: name of the process which set up the timer | 229 | * @comm: name of the process which set up the timer |
230 | * @tflags: The flags field of the timer | ||
230 | * | 231 | * |
231 | * When the timer is already registered, then the event counter is | 232 | * When the timer is already registered, then the event counter is |
232 | * incremented. Otherwise the timer is registered in a free slot. | 233 | * incremented. Otherwise the timer is registered in a free slot. |
233 | */ | 234 | */ |
234 | void timer_stats_update_stats(void *timer, pid_t pid, void *startf, | 235 | void timer_stats_update_stats(void *timer, pid_t pid, void *startf, |
235 | void *timerf, char *comm, | 236 | void *timerf, char *comm, u32 tflags) |
236 | unsigned int timer_flag) | ||
237 | { | 237 | { |
238 | /* | 238 | /* |
239 | * It doesn't matter which lock we take: | 239 | * It doesn't matter which lock we take: |
@@ -251,7 +251,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, | |||
251 | input.start_func = startf; | 251 | input.start_func = startf; |
252 | input.expire_func = timerf; | 252 | input.expire_func = timerf; |
253 | input.pid = pid; | 253 | input.pid = pid; |
254 | input.timer_flag = timer_flag; | 254 | input.flags = tflags; |
255 | 255 | ||
256 | raw_spin_lock_irqsave(lock, flags); | 256 | raw_spin_lock_irqsave(lock, flags); |
257 | if (!timer_stats_active) | 257 | if (!timer_stats_active) |
@@ -306,7 +306,7 @@ static int tstats_show(struct seq_file *m, void *v) | |||
306 | 306 | ||
307 | for (i = 0; i < nr_entries; i++) { | 307 | for (i = 0; i < nr_entries; i++) { |
308 | entry = entries + i; | 308 | entry = entries + i; |
309 | if (entry->timer_flag & TIMER_STATS_FLAG_DEFERRABLE) { | 309 | if (entry->flags & TIMER_DEFERRABLE) { |
310 | seq_printf(m, "%4luD, %5d %-16s ", | 310 | seq_printf(m, "%4luD, %5d %-16s ", |
311 | entry->count, entry->pid, entry->comm); | 311 | entry->count, entry->pid, entry->comm); |
312 | } else { | 312 | } else { |