diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 20:59:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 20:59:09 -0400 |
| commit | 78b148696d380698270a15352bdb733631872aee (patch) | |
| tree | 955fa1d2dbc36fd8d3bbd073206f5f9ae321dd52 /arch/x86/kernel | |
| parent | 7ec3fa1f4a5c4f9cc3d72983bfd8ac87cae356ab (diff) | |
| parent | 3f6c4df7e1f05f2fdb3f20cac9c03f595a72b45d (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] acpi-cpufreq: add missing __percpu markup
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index 246cd3afbb5f..cd8da247dda1 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
| @@ -72,7 +72,7 @@ struct acpi_cpufreq_data { | |||
| 72 | static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data); | 72 | static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data); |
| 73 | 73 | ||
| 74 | /* acpi_perf_data is a pointer to percpu data. */ | 74 | /* acpi_perf_data is a pointer to percpu data. */ |
| 75 | static struct acpi_processor_performance *acpi_perf_data; | 75 | static struct acpi_processor_performance __percpu *acpi_perf_data; |
| 76 | 76 | ||
| 77 | static struct cpufreq_driver acpi_cpufreq_driver; | 77 | static struct cpufreq_driver acpi_cpufreq_driver; |
| 78 | 78 | ||