diff options
author | Peter Zijlstra <peterz@infradead.org> | 2013-08-14 08:55:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-09-25 08:07:32 -0400 |
commit | 4a2b4b222743bb07fedf985b884550f2ca067ea9 (patch) | |
tree | 587e80512c6cdf727b27d0f806758833547a65ed /kernel/softirq.c | |
parent | ea8117478918a4734586d35ff530721b682425be (diff) |
sched: Introduce preempt_count accessor functions
Replace the single preempt_count() 'function' that's an lvalue with
two proper functions:
preempt_count() - returns the preempt_count value as rvalue
preempt_count_set() - Allows setting the preempt-count value
Also provide preempt_count_ptr() as a convenience wrapper to implement
all modifying operations.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-orxrbycjozopqfhb4dxdkdvb@git.kernel.org
[ Fixed build failure. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 53cc09ceb0b8..a90de70cf1f3 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
@@ -106,7 +106,7 @@ static void __local_bh_disable(unsigned long ip, unsigned int cnt) | |||
106 | * We must manually increment preempt_count here and manually | 106 | * We must manually increment preempt_count here and manually |
107 | * call the trace_preempt_off later. | 107 | * call the trace_preempt_off later. |
108 | */ | 108 | */ |
109 | preempt_count() += cnt; | 109 | add_preempt_count_notrace(cnt); |
110 | /* | 110 | /* |
111 | * Were softirqs turned off above: | 111 | * Were softirqs turned off above: |
112 | */ | 112 | */ |
@@ -256,7 +256,7 @@ restart: | |||
256 | " exited with %08x?\n", vec_nr, | 256 | " exited with %08x?\n", vec_nr, |
257 | softirq_to_name[vec_nr], h->action, | 257 | softirq_to_name[vec_nr], h->action, |
258 | prev_count, preempt_count()); | 258 | prev_count, preempt_count()); |
259 | preempt_count() = prev_count; | 259 | preempt_count_set(prev_count); |
260 | } | 260 | } |
261 | 261 | ||
262 | rcu_bh_qs(cpu); | 262 | rcu_bh_qs(cpu); |