summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 17:59:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 17:59:09 -0700
commit78b148696d380698270a15352bdb733631872aee (patch)
tree955fa1d2dbc36fd8d3bbd073206f5f9ae321dd52 /arch
parent7ec3fa1f4a5c4f9cc3d72983bfd8ac87cae356ab (diff)
parent3f6c4df7e1f05f2fdb3f20cac9c03f595a72b45d (diff)
downloadop-kernel-dev-78b148696d380698270a15352bdb733631872aee.zip
op-kernel-dev-78b148696d380698270a15352bdb733631872aee.tar.gz
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')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c2
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 246cd3a..cd8da24 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 {
static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
/* acpi_perf_data is a pointer to percpu data. */
-static struct acpi_processor_performance *acpi_perf_data;
+static struct acpi_processor_performance __percpu *acpi_perf_data;
static struct cpufreq_driver acpi_cpufreq_driver;
OpenPOWER on IntegriCloud