diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /include/linux/rcuclassic.h | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/linux/rcuclassic.h')
| -rw-r--r-- | include/linux/rcuclassic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h index 301dda829e37..f3f697df1d71 100644 --- a/include/linux/rcuclassic.h +++ b/include/linux/rcuclassic.h | |||
| @@ -59,8 +59,8 @@ struct rcu_ctrlblk { | |||
| 59 | int signaled; | 59 | int signaled; |
| 60 | 60 | ||
| 61 | spinlock_t lock ____cacheline_internodealigned_in_smp; | 61 | spinlock_t lock ____cacheline_internodealigned_in_smp; |
| 62 | cpumask_t cpumask; /* CPUs that need to switch in order */ | 62 | DECLARE_BITMAP(cpumask, NR_CPUS); /* CPUs that need to switch for */ |
| 63 | /* for current batch to proceed. */ | 63 | /* current batch to proceed. */ |
| 64 | } ____cacheline_internodealigned_in_smp; | 64 | } ____cacheline_internodealigned_in_smp; |
| 65 | 65 | ||
| 66 | /* Is batch a before batch b ? */ | 66 | /* Is batch a before batch b ? */ |