diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /kernel/sched_cpupri.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'kernel/sched_cpupri.h')
| -rw-r--r-- | kernel/sched_cpupri.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_cpupri.h b/kernel/sched_cpupri.h index 9a7e859b8fbf..7cb5bb6b95be 100644 --- a/kernel/sched_cpupri.h +++ b/kernel/sched_cpupri.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | /* values 2-101 are RT priorities 0-99 */ | 12 | /* values 2-101 are RT priorities 0-99 */ |
| 13 | 13 | ||
| 14 | struct cpupri_vec { | 14 | struct cpupri_vec { |
| 15 | spinlock_t lock; | 15 | raw_spinlock_t lock; |
| 16 | int count; | 16 | int count; |
| 17 | cpumask_var_t mask; | 17 | cpumask_var_t mask; |
| 18 | }; | 18 | }; |