git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
posix-cpu-timers: cleanup rlimits usage
[safe/jmp/linux-2.6]
/
lib
/
smp_processor_id.c
diff --git
a/lib/smp_processor_id.c
b/lib/smp_processor_id.c
index
6c90fb9
..
4689cb0
100644
(file)
--- a/
lib/smp_processor_id.c
+++ b/
lib/smp_processor_id.c
@@
-7,11
+7,10
@@
#include <linux/kallsyms.h>
#include <linux/sched.h>
#include <linux/kallsyms.h>
#include <linux/sched.h>
-unsigned int debug_smp_processor_id(void)
+
notrace
unsigned int debug_smp_processor_id(void)
{
unsigned long preempt_count = preempt_count();
int this_cpu = raw_smp_processor_id();
{
unsigned long preempt_count = preempt_count();
int this_cpu = raw_smp_processor_id();
- cpumask_t this_mask;
if (likely(preempt_count))
goto out;
if (likely(preempt_count))
goto out;
@@
-23,9
+22,7
@@
unsigned int debug_smp_processor_id(void)
* Kernel threads bound to a single CPU can safely use
* smp_processor_id():
*/
* 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))
+ if (cpumask_equal(¤t->cpus_allowed, cpumask_of(this_cpu)))
goto out;
/*
goto out;
/*
@@
-37,7
+34,7
@@
unsigned int debug_smp_processor_id(void)
/*
* Avoid recursion:
*/
/*
* Avoid recursion:
*/
- preempt_disable();
+ preempt_disable
_notrace
();
if (!printk_ratelimit())
goto out_enable;
if (!printk_ratelimit())
goto out_enable;
@@
-49,7
+46,7
@@
unsigned int debug_smp_processor_id(void)
dump_stack();
out_enable:
dump_stack();
out_enable:
- preempt_enable_no_resched();
+ preempt_enable_no_resched
_notrace
();
out:
return this_cpu;
}
out:
return this_cpu;
}