diff options
Diffstat (limited to 'kernel/time/timer_stats.c')
| -rw-r--r-- | kernel/time/timer_stats.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c index 2f3b585b8d7..1fb08f21302 100644 --- a/kernel/time/timer_stats.c +++ b/kernel/time/timer_stats.c @@ -81,7 +81,7 @@ struct entry {  /*   * Spinlock protecting the tables - not taken during lookup:   */ -static DEFINE_SPINLOCK(table_lock); +static DEFINE_RAW_SPINLOCK(table_lock);  /*   * Per-CPU lookup locks for fast hash lookup: @@ -188,7 +188,7 @@ static struct entry *tstat_lookup(struct entry *entry, char *comm)  	prev = NULL;  	curr = *head; -	spin_lock(&table_lock); +	raw_spin_lock(&table_lock);  	/*  	 * Make sure we have not raced with another CPU:  	 */ @@ -215,7 +215,7 @@ static struct entry *tstat_lookup(struct entry *entry, char *comm)  			*head = curr;  	}   out_unlock: -	spin_unlock(&table_lock); +	raw_spin_unlock(&table_lock);  	return curr;  } @@ -236,7 +236,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,  			      unsigned int timer_flag)  {  	/* -	 * It doesnt matter which lock we take: +	 * It doesn't matter which lock we take:  	 */  	raw_spinlock_t *lock;  	struct entry *entry, input; @@ -298,15 +298,15 @@ static int tstats_show(struct seq_file *m, void *v)  	period = ktime_to_timespec(time);  	ms = period.tv_nsec / 1000000; -	seq_puts(m, "Timer Stats Version: v0.2\n"); +	seq_puts(m, "Timer Stats Version: v0.3\n");  	seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);  	if (atomic_read(&overflow_count)) -		seq_printf(m, "Overflow: %d entries\n", -			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");  	for (i = 0; i < nr_entries; i++) {  		entry = entries + i; - 		if (entry->timer_flag & TIMER_STATS_FLAG_DEFERRABLE) { +		if (entry->timer_flag & TIMER_STATS_FLAG_DEFERRABLE) {  			seq_printf(m, "%4luD, %5d %-16s ",  				entry->count, entry->pid, entry->comm);  		} else {  | 
