summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-08-11 13:14:58 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:22 (GMT)
commitef9eac1a1d7a8c33fcec62b5c74ba574598919ce (patch)
tree2f294e0f973e84a8b3deb91b2cac0cca5cf9d426 /lib
parentc1dbc939c9b46bb2001f6580dc4def865ff6d96c (diff)
downloadlinux-fsl-qoriq-ef9eac1a1d7a8c33fcec62b5c74ba574598919ce.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 'lib')
-rw-r--r--lib/smp_processor_id.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
index 0a846e7..dbb1570 100644
--- a/lib/smp_processor_id.c
+++ b/lib/smp_processor_id.c
@@ -41,7 +41,7 @@ notrace unsigned int debug_smp_processor_id(void)
printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x %08x] "
"code: %s/%d\n", preempt_count() - 1,
- current->migrate_disable, current->comm, current->pid);
+ __migrate_disabled(current), current->comm, current->pid);
print_symbol("caller is %s\n", (long)__builtin_return_address(0));
dump_stack();