diff options
Diffstat (limited to 'kernel/time/timer_stats.c')
| -rw-r--r-- | kernel/time/timer_stats.c | 17 | 
1 files changed, 9 insertions, 8 deletions
| diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c index 63b117e9eba1..2f3b585b8d7d 100644 --- a/kernel/time/timer_stats.c +++ b/kernel/time/timer_stats.c | |||
| @@ -86,7 +86,7 @@ static DEFINE_SPINLOCK(table_lock); | |||
| 86 | /* | 86 | /* | 
| 87 | * Per-CPU lookup locks for fast hash lookup: | 87 | * Per-CPU lookup locks for fast hash lookup: | 
| 88 | */ | 88 | */ | 
| 89 | static DEFINE_PER_CPU(spinlock_t, tstats_lookup_lock); | 89 | static DEFINE_PER_CPU(raw_spinlock_t, tstats_lookup_lock); | 
| 90 | 90 | ||
| 91 | /* | 91 | /* | 
| 92 | * Mutex to serialize state changes with show-stats activities: | 92 | * Mutex to serialize state changes with show-stats activities: | 
| @@ -238,7 +238,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, | |||
| 238 | /* | 238 | /* | 
| 239 | * It doesnt matter which lock we take: | 239 | * It doesnt matter which lock we take: | 
| 240 | */ | 240 | */ | 
| 241 | spinlock_t *lock; | 241 | raw_spinlock_t *lock; | 
| 242 | struct entry *entry, input; | 242 | struct entry *entry, input; | 
| 243 | unsigned long flags; | 243 | unsigned long flags; | 
| 244 | 244 | ||
| @@ -253,7 +253,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, | |||
| 253 | input.pid = pid; | 253 | input.pid = pid; | 
| 254 | input.timer_flag = timer_flag; | 254 | input.timer_flag = timer_flag; | 
| 255 | 255 | ||
| 256 | spin_lock_irqsave(lock, flags); | 256 | raw_spin_lock_irqsave(lock, flags); | 
| 257 | if (!timer_stats_active) | 257 | if (!timer_stats_active) | 
| 258 | goto out_unlock; | 258 | goto out_unlock; | 
| 259 | 259 | ||
| @@ -264,7 +264,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf, | |||
| 264 | atomic_inc(&overflow_count); | 264 | atomic_inc(&overflow_count); | 
| 265 | 265 | ||
| 266 | out_unlock: | 266 | out_unlock: | 
| 267 | spin_unlock_irqrestore(lock, flags); | 267 | raw_spin_unlock_irqrestore(lock, flags); | 
| 268 | } | 268 | } | 
| 269 | 269 | ||
| 270 | static void print_name_offset(struct seq_file *m, unsigned long addr) | 270 | static void print_name_offset(struct seq_file *m, unsigned long addr) | 
| @@ -348,10 +348,11 @@ static void sync_access(void) | |||
| 348 | int cpu; | 348 | int cpu; | 
| 349 | 349 | ||
| 350 | for_each_online_cpu(cpu) { | 350 | for_each_online_cpu(cpu) { | 
| 351 | spinlock_t *lock = &per_cpu(tstats_lookup_lock, cpu); | 351 | raw_spinlock_t *lock = &per_cpu(tstats_lookup_lock, cpu); | 
| 352 | spin_lock_irqsave(lock, flags); | 352 | |
| 353 | raw_spin_lock_irqsave(lock, flags); | ||
| 353 | /* nothing */ | 354 | /* nothing */ | 
| 354 | spin_unlock_irqrestore(lock, flags); | 355 | raw_spin_unlock_irqrestore(lock, flags); | 
| 355 | } | 356 | } | 
| 356 | } | 357 | } | 
| 357 | 358 | ||
| @@ -409,7 +410,7 @@ void __init init_timer_stats(void) | |||
| 409 | int cpu; | 410 | int cpu; | 
| 410 | 411 | ||
| 411 | for_each_possible_cpu(cpu) | 412 | for_each_possible_cpu(cpu) | 
| 412 | spin_lock_init(&per_cpu(tstats_lookup_lock, cpu)); | 413 | raw_spin_lock_init(&per_cpu(tstats_lookup_lock, cpu)); | 
| 413 | } | 414 | } | 
| 414 | 415 | ||
| 415 | static int __init init_tstats_procfs(void) | 416 | static int __init init_tstats_procfs(void) | 
