forked from luck/tmp_suning_uos_patched
4e57b68178
I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
57 lines
1.1 KiB
C
57 lines
1.1 KiB
C
/*
|
|
* lib/smp_processor_id.c
|
|
*
|
|
* DEBUG_PREEMPT variant of smp_processor_id().
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/kallsyms.h>
|
|
#include <linux/sched.h>
|
|
|
|
unsigned int debug_smp_processor_id(void)
|
|
{
|
|
unsigned long preempt_count = preempt_count();
|
|
int this_cpu = raw_smp_processor_id();
|
|
cpumask_t this_mask;
|
|
|
|
if (likely(preempt_count))
|
|
goto out;
|
|
|
|
if (irqs_disabled())
|
|
goto out;
|
|
|
|
/*
|
|
* Kernel threads bound to a single CPU can safely use
|
|
* smp_processor_id():
|
|
*/
|
|
this_mask = cpumask_of_cpu(this_cpu);
|
|
|
|
if (cpus_equal(current->cpus_allowed, this_mask))
|
|
goto out;
|
|
|
|
/*
|
|
* It is valid to assume CPU-locality during early bootup:
|
|
*/
|
|
if (system_state != SYSTEM_RUNNING)
|
|
goto out;
|
|
|
|
/*
|
|
* Avoid recursion:
|
|
*/
|
|
preempt_disable();
|
|
|
|
if (!printk_ratelimit())
|
|
goto out_enable;
|
|
|
|
printk(KERN_ERR "BUG: using smp_processor_id() in preemptible [%08x] code: %s/%d\n", preempt_count(), current->comm, current->pid);
|
|
print_symbol("caller is %s\n", (long)__builtin_return_address(0));
|
|
dump_stack();
|
|
|
|
out_enable:
|
|
preempt_enable_no_resched();
|
|
out:
|
|
return this_cpu;
|
|
}
|
|
|
|
EXPORT_SYMBOL(debug_smp_processor_id);
|
|
|