diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2008-12-26 09:08:55 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 07:43:00 -0500 |
commit | ea319518ba3de282c13ae1cf4bf2215c5e03e67e (patch) | |
tree | 72eea2b8e5d8926e95ade18d610d59b13df5dae5 /lib/proportions.c | |
parent | 00ef9f7348dfd2fc223ec42aceb30836e86b367f (diff) |
locking, percpu counters: introduce separate lock classes
Impact: fix lockdep false positives
Classify percpu_counter instances similar to regular lock objects --
that is, per instantiation site.
The networking code has increased its use of percpu_counters, which
leads to false positives if they are treated as a single class.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/proportions.c')
-rw-r--r-- | lib/proportions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/proportions.c b/lib/proportions.c index 4f387a643d72..7367f2b727d0 100644 --- a/lib/proportions.c +++ b/lib/proportions.c | |||
@@ -83,11 +83,11 @@ int prop_descriptor_init(struct prop_descriptor *pd, int shift) | |||
83 | pd->index = 0; | 83 | pd->index = 0; |
84 | pd->pg[0].shift = shift; | 84 | pd->pg[0].shift = shift; |
85 | mutex_init(&pd->mutex); | 85 | mutex_init(&pd->mutex); |
86 | err = percpu_counter_init_irq(&pd->pg[0].events, 0); | 86 | err = percpu_counter_init(&pd->pg[0].events, 0); |
87 | if (err) | 87 | if (err) |
88 | goto out; | 88 | goto out; |
89 | 89 | ||
90 | err = percpu_counter_init_irq(&pd->pg[1].events, 0); | 90 | err = percpu_counter_init(&pd->pg[1].events, 0); |
91 | if (err) | 91 | if (err) |
92 | percpu_counter_destroy(&pd->pg[0].events); | 92 | percpu_counter_destroy(&pd->pg[0].events); |
93 | 93 | ||
@@ -191,7 +191,7 @@ int prop_local_init_percpu(struct prop_local_percpu *pl) | |||
191 | spin_lock_init(&pl->lock); | 191 | spin_lock_init(&pl->lock); |
192 | pl->shift = 0; | 192 | pl->shift = 0; |
193 | pl->period = 0; | 193 | pl->period = 0; |
194 | return percpu_counter_init_irq(&pl->events, 0); | 194 | return percpu_counter_init(&pl->events, 0); |
195 | } | 195 | } |
196 | 196 | ||
197 | void prop_local_destroy_percpu(struct prop_local_percpu *pl) | 197 | void prop_local_destroy_percpu(struct prop_local_percpu *pl) |