Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 60 deletions

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 347eb21b2353..a4e0f1ba6040 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -40,8 +40,6 @@
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
 #include <linux/cpu.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
 #include <linux/cpuidle.h>
@@ -244,43 +242,6 @@ static int acpi_processor_errata(struct acpi_processor *pr)
         return result;
 }
 
-static struct proc_dir_entry *acpi_processor_dir = NULL;
-
-static int __cpuinit acpi_processor_add_fs(struct acpi_device *device)
-{
-        struct proc_dir_entry *entry = NULL;
-
-
-        if (!acpi_device_dir(device)) {
-                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                                                     acpi_processor_dir);
-                if (!acpi_device_dir(device))
-                        return -ENODEV;
-        }
-
-        /* 'throttling' [R/W] */
-        entry = proc_create_data(ACPI_PROCESSOR_FILE_THROTTLING,
-                                 S_IFREG | S_IRUGO | S_IWUSR,
-                                 acpi_device_dir(device),
-                                 &acpi_processor_throttling_fops,
-                                 acpi_driver_data(device));
-        if (!entry)
-                return -EIO;
-        return 0;
-}
-static int acpi_processor_remove_fs(struct acpi_device *device)
-{
-
-        if (acpi_device_dir(device)) {
-                remove_proc_entry(ACPI_PROCESSOR_FILE_THROTTLING,
-                                  acpi_device_dir(device));
-                remove_proc_entry(acpi_device_bid(device), acpi_processor_dir);
-                acpi_device_dir(device) = NULL;
-        }
-
-        return 0;
-}
-
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
@@ -466,8 +427,13 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
         if (action == CPU_ONLINE && pr) {
                 acpi_processor_ppc_has_changed(pr, 0);
                 acpi_processor_cst_has_changed(pr);
+                acpi_processor_reevaluate_tstate(pr, action);
                 acpi_processor_tstate_has_changed(pr);
         }
+        if (action == CPU_DEAD && pr) {
+                /* invalidate the flag.throttling after one CPU is offline */
+                acpi_processor_reevaluate_tstate(pr, action);
+        }
         return NOTIFY_OK;
 }
 
@@ -525,14 +491,10 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
 
         per_cpu(processors, pr->id) = pr;
 
-        result = acpi_processor_add_fs(device);
-        if (result)
-                goto err_free_cpumask;
-
         sysdev = get_cpu_sysdev(pr->id);
         if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) {
                 result = -EFAULT;
-                goto err_remove_fs;
+                goto err_free_cpumask;
         }
 
 #ifdef CONFIG_CPU_FREQ
@@ -578,8 +540,6 @@ err_thermal_unregister:
         thermal_cooling_device_unregister(pr->cdev);
 err_power_exit:
         acpi_processor_power_exit(pr, device);
-err_remove_fs:
-        acpi_processor_remove_fs(device);
 err_free_cpumask:
         free_cpumask_var(pr->throttling.shared_cpu_map);
 
@@ -608,8 +568,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         sysfs_remove_link(&device->dev.kobj, "sysdev");
 
-        acpi_processor_remove_fs(device);
-
         if (pr->cdev) {
                 sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
                 sysfs_remove_link(&pr->cdev->device.kobj, "device");
@@ -677,8 +635,8 @@ int acpi_processor_device_add(acpi_handle handle, struct acpi_device **device)
         return 0;
 }
 
-static void __ref acpi_processor_hotplug_notify(acpi_handle handle,
-                                                u32 event, void *data)
+static void acpi_processor_hotplug_notify(acpi_handle handle,
+                                          u32 event, void *data)
 {
         struct acpi_processor *pr;
         struct acpi_device *device = NULL;
@@ -842,10 +800,6 @@ static int __init acpi_processor_init(void)
 
         memset(&errata, 0, sizeof(errata));
 
-        acpi_processor_dir = proc_mkdir(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-        if (!acpi_processor_dir)
-                return -ENOMEM;
-
         if (!cpuidle_register_driver(&acpi_idle_driver)) {
                 printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
                         acpi_idle_driver.name);
@@ -871,8 +825,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-
         return result;
 }
 
@@ -891,14 +843,10 @@ static void __exit acpi_processor_exit(void)
 
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-        remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
-
         return;
 }
 
 module_init(acpi_processor_init);
 module_exit(acpi_processor_exit);
 
-EXPORT_SYMBOL(acpi_processor_set_thermal_limit);
-
 MODULE_ALIAS("processor");