diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:07:11 -0400 |
| commit | 4032816dca04141e3d49ec4ed717c9f7cc5444c5 (patch) | |
| tree | 28cd19cff00011f4709e84632a481f1a05f35558 /arch/x86 | |
| parent | 1c00650c233c404fadf9347329214d55283bd17a (diff) | |
| parent | a3da323420d5aa6f7bd15efc7bf34cd6d19e1f1a (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] add missing __percpu markup in pcc-cpufreq.c
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c index a36de5bbb622..994230d4dc4e 100644 --- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | |||
| @@ -110,7 +110,7 @@ struct pcc_cpu { | |||
| 110 | u32 output_offset; | 110 | u32 output_offset; |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | static struct pcc_cpu *pcc_cpu_info; | 113 | static struct pcc_cpu __percpu *pcc_cpu_info; |
| 114 | 114 | ||
| 115 | static int pcc_cpufreq_verify(struct cpufreq_policy *policy) | 115 | static int pcc_cpufreq_verify(struct cpufreq_policy *policy) |
| 116 | { | 116 | { |