git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
cpufreq
/
p4-clockmod.c
diff --git
a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 41ed94915f974ce0310510d9864b54d8e96f37df..6ac55bd341ae8802abf29c6180533d08ab68930c 100644
(file)
--- a/
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@
-211,7
+211,7
@@
static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
unsigned int i;
#ifdef CONFIG_SMP
- cpumask_copy(policy->cpus,
&per_cpu(cpu_sibling_map,
policy->cpu));
+ cpumask_copy(policy->cpus,
cpu_sibling_mask(
policy->cpu));
#endif
/* Errata workaround */