From 35f5bdb6a3af77edb81f3d4a03bbf22a3f8f8d36 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 7 Feb 2012 11:45:57 -0800
Subject: [PATCH] --- yaml --- r: 288864 b: refs/heads/master c:
 976a0be03a15f1c268e3f569c0ade3e7ff8ce478 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/acpi/processor_driver.c | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 8f3776aef912..d768b697e730 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3012e12cdc5825f93367cc6294419e7ab1f00cc
+refs/heads/master: 976a0be03a15f1c268e3f569c0ade3e7ff8ce478
diff --git a/trunk/drivers/acpi/processor_driver.c b/trunk/drivers/acpi/processor_driver.c
index f289d2afbd4e..2801b418d7bb 100644
--- a/trunk/drivers/acpi/processor_driver.c
+++ b/trunk/drivers/acpi/processor_driver.c
@@ -474,6 +474,7 @@ static __ref int acpi_processor_start(struct acpi_processor *pr)
 
 #ifdef CONFIG_CPU_FREQ
 	acpi_processor_ppc_has_changed(pr, 0);
+	acpi_processor_load_module(pr);
 #endif
 	acpi_processor_get_throttling_info(pr);
 	acpi_processor_get_limit_info(pr);
@@ -579,23 +580,6 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
 		goto err_free_cpumask;
 	}
 
-#ifdef CONFIG_CPU_FREQ
-	acpi_processor_ppc_has_changed(pr, 0);
-	acpi_processor_load_module(pr);
-#endif
-	acpi_processor_get_throttling_info(pr);
-	acpi_processor_get_limit_info(pr);
-
-	if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
-		acpi_processor_power_init(pr, device);
-
-	pr->cdev = thermal_cooling_device_register("Processor", device,
-						&processor_cooling_ops);
-	if (IS_ERR(pr->cdev)) {
-		result = PTR_ERR(pr->cdev);
-		goto err_remove_sysfs;
-	}
-
 	/*
 	 * Do not start hotplugged CPUs now, but when they
 	 * are onlined the first time