aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2010-02-22 12:11:08 -0700
committerLen Brown <len.brown@intel.com>2010-03-14 21:17:16 -0400
commit0131aa3dd7dcf41c66784b96ff351f63ee3ef348 (patch)
tree0222e8ac1fdfa853814f7a98b69c91e3d7a04613
parentMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
downloadlinux-dev-0131aa3dd7dcf41c66784b96ff351f63ee3ef348.tar.xz
linux-dev-0131aa3dd7dcf41c66784b96ff351f63ee3ef348.zip
ACPI: processor: mv processor_core.c processor_driver.c
The ACPI processor driver can be built as a module. But it has pieces of code that should always be built statically into the kernel. The plan is for processor_core.c to contain the static bits while processor_driver.c contains the module-like bits. Since the bulk of the code in the current processor_core.c is module-like, first step is to rename the file to processor_driver.c Next step will re-create processor_core.c and cherry-pick out the static bits. Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/Makefile2
-rw-r--r--drivers/acpi/processor_driver.c (renamed from drivers/acpi/processor_core.c)2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 66cc3f36a954..6b363a50d18b 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -61,7 +61,7 @@ obj-$(CONFIG_ACPI_SBS) += sbs.o
obj-$(CONFIG_ACPI_POWER_METER) += power_meter.o
# processor has its own "processor." module_param namespace
-processor-y := processor_core.o processor_throttling.o
+processor-y := processor_driver.o processor_throttling.o
processor-y += processor_idle.o processor_thermal.o
processor-$(CONFIG_CPU_FREQ) += processor_perflib.o
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_driver.c
index e9b7b402dbfb..7b0f4c2a06e8 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_driver.c
@@ -74,7 +74,7 @@
#define ACPI_PROCESSOR_LIMIT_THERMAL 1
#define _COMPONENT ACPI_PROCESSOR_COMPONENT
-ACPI_MODULE_NAME("processor_core");
+ACPI_MODULE_NAME("processor_driver");
MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION("ACPI Processor Driver");