1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 4540672a2e1c..e81cfda295a5 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -171,7 +171,11 @@ int cpuidle_idle_call(void)
         trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
         trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
-        entered_state = cpuidle_enter_state(dev, drv, next_state);
+        if (cpuidle_state_is_coupled(dev, drv, next_state))
+                entered_state = cpuidle_enter_state_coupled(dev, drv,
+                                                            next_state);
+        else
+                entered_state = cpuidle_enter_state(dev, drv, next_state);
 
         trace_power_end_rcuidle(dev->cpu);
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
@@ -407,9 +411,16 @@ static int __cpuidle_register_device(struct cpuidle_device *dev)
         if (ret)
                 goto err_sysfs;
 
+        ret = cpuidle_coupled_register_device(dev);
+        if (ret)
+                goto err_coupled;
+
         dev->registered = 1;
         return 0;
 
+err_coupled:
+        cpuidle_remove_sysfs(cpu_dev);
+        wait_for_completion(&dev->kobj_unregister);
 err_sysfs:
         list_del(&dev->device_list);
         per_cpu(cpuidle_devices, dev->cpu) = NULL;
@@ -464,6 +475,8 @@ void cpuidle_unregister_device(struct cpuidle_device *dev)
         wait_for_completion(&dev->kobj_unregister);
         per_cpu(cpuidle_devices, dev->cpu) = NULL;
 
+        cpuidle_coupled_unregister_device(dev);
+
         cpuidle_resume_and_unlock();
 
         module_put(cpuidle_driver->owner);