projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[cascardo/linux.git]
/
arch
/
x86
/
oprofile
/
op_model_p4.c
diff --git
a/arch/x86/oprofile/op_model_p4.c
b/arch/x86/oprofile/op_model_p4.c
index
98ab130
..
ad1d91f
100644
(file)
--- a/
arch/x86/oprofile/op_model_p4.c
+++ b/
arch/x86/oprofile/op_model_p4.c
@@
-372,7
+372,7
@@
static unsigned int get_stagger(void)
{
#ifdef CONFIG_SMP
int cpu = smp_processor_id();
- return cpu != cpumask_first(
__get_cpu_va
r(cpu_sibling_map));
+ return cpu != cpumask_first(
this_cpu_cpumask_var_pt
r(cpu_sibling_map));
#endif
return 0;
}