Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2012-05-22 14:21:24 +0200
committerThomas Renninger <trenn@suse.de>2012-05-22 14:21:24 +0200
commit526e2c1490f9804f8dd5c47f7cfaba74e1b80a4d (patch)
treee438be37ff754a71b6bbce5a593355a019dbab7c
parentb0b9e5c5258d001c71aec8bab747bef45055f811 (diff)
- X86 acpi_cpufreq: Do not use request_module for autoloading
(bnc#756085). - Refresh patches.xen/xen3-auto-common.diff. - patches.xen/xen3-patch-3.3: suse-commit: caf270e04273aee3752f0e9cefc308172d893240
-rw-r--r--drivers/acpi/processor_driver.c3
-rw-r--r--drivers/cpufreq/acpi-cpufreq.c7
-rw-r--r--include/acpi/processor.h1
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 5d0d9b3fb646..0912a14fc35a 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -502,9 +502,6 @@ static __ref int acpi_processor_start(struct acpi_processor *pr)
#if defined(CONFIG_CPU_FREQ) || defined(CONFIG_PROCESSOR_EXTERNAL_CONTROL)
acpi_processor_ppc_has_changed(pr, 0);
#endif
-#ifdef CONFIG_CPU_FREQ
- acpi_processor_load_module(pr);
-#endif
/*
* pr->id may equal to -1 while processor_cntl_external enabled.
* throttle and thermal module don't support this case.
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 56c6c6b4eb4d..c7b817420bea 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -66,6 +66,13 @@ struct acpi_cpufreq_data {
unsigned int cpu_feature;
};
+static const struct x86_cpu_id acpi_cpufreq_ids[] = {
+ /* Enhanced Speed Step */
+ X86_FEATURE_MATCH(X86_FEATURE_EST),
+ {}
+};
+MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
+
static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
/* acpi_perf_data is a pointer to percpu data. */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index ab7efd2e756f..5a45e08845c7 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -254,7 +254,6 @@ struct acpi_processor_errata {
} piix4;
};
-extern void acpi_processor_load_module(struct acpi_processor *pr);
extern int acpi_processor_preregister_performance(struct
acpi_processor_performance
__percpu *performance);