Merge tag 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / drivers / cpuidle / cpuidle-pseries.c

diff --git a/drivers/cpuidle/cpuidle-pseries.c b/drivers/cpuidle/cpuidle-pseries.c
index a7d33f3ee01e71f2da37f3e977368e2b2ed26663..14db9b7d985d143268e73dba0851c7f87a0d198d 100644 (file)
--- a/drivers/cpuidle/cpuidle-pseries.c
+++ b/drivers/cpuidle/cpuidle-pseries.c
@@ -414,13 +414,7 @@ static int __init pseries_idle_probe(void)
                return -ENODEV;
 
        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
-               /*
-                * Use local_paca instead of get_lppaca() since
-                * preemption is not disabled, and it is not required in
-                * fact, since lppaca_ptr does not need to be the value
-                * associated to the current CPU, it can be from any CPU.
-                */
-               if (lppaca_shared_proc(local_paca->lppaca_ptr)) {
+               if (lppaca_shared_proc()) {
                        cpuidle_state_table = shared_states;
                        max_idle_state = ARRAY_SIZE(shared_states);
                } else {