summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 13:14:58 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:37 (GMT)
commit9105ed27c65b20337dbfb193835c8538fb767179 (patch)
tree200682f8b9d1e63b3d92bb2b0bc08348931531d7 /kernel/trace
parent9587cb84db747d8cbe73bf8861e843778a5a462b (diff)
downloadlinux-fsl-qoriq-9105ed27c65b20337dbfb193835c8538fb767179.tar.xz
sched: Generic migrate_disable
Make migrate_disable() be a preempt_disable() for !rt kernels. This allows generic code to use it but still enforces that these code sections stay relatively small. A preemptible migrate_disable() accessible for general use would allow people growing arbitrary per-cpu crap instead of clean these things up. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/n/tip-275i87sl8e1jcamtchmehonm@git.kernel.org
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 04a82dc..84486c0 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1533,7 +1533,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
(need_resched() ? TRACE_FLAG_NEED_RESCHED : 0);
- entry->migrate_disable = (tsk) ? tsk->migrate_disable & 0xFF : 0;
+ entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);