diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:56:47 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-17 01:56:47 +0100 |
| commit | 9612a461c1e48f75ca1e1f0faf9c928761baae5b (patch) | |
| tree | 19b80da3e4cabca51dcbc5a4f7432312ea251351 /arch/arm | |
| parent | 4ff913373a77b99cbe3c5df3c76d2622006200d6 (diff) | |
| parent | 4955a5412cad83da6e994d939bdb4f7887e4585e (diff) | |
| download | blackbird-op-linux-9612a461c1e48f75ca1e1f0faf9c928761baae5b.tar.gz blackbird-op-linux-9612a461c1e48f75ca1e1f0faf9c928761baae5b.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
intel_idle: remove superfluous dev->state_count initialization
intel_idle: do C1E promotion disable quirk for hotplugged CPUs
ACPI / cpuidle: remove dev->state_count setting
ACPI / cpuidle: fix max idle state handling with hotplug CPU support
POWERPC: pseries: cpuidle: use the common cpuidle_[un]register() routines
POWERPC: pseries: cpuidle: remove superfluous dev->state_count initialization
ARM: EXYNOS: cpuidle: fix AFTR mode check
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-exynos/cpuidle.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index ddbfe8709fe7..8e0eb2ef8c41 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -151,8 +151,8 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev, { int new_index = index; - /* This mode only can be entered when other core's are offline */ - if (num_online_cpus() > 1) + /* AFTR can only be entered when cores other than CPU0 are offline */ + if (num_online_cpus() > 1 || dev->cpu != 0) new_index = drv->safe_state_index; if (new_index == 0) @@ -214,10 +214,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) device = &per_cpu(exynos4_cpuidle_device, cpu_id); device->cpu = cpu_id; - /* Support IDLE only */ - if (cpu_id != 0) - device->state_count = 1; - ret = cpuidle_register_device(device); if (ret) { dev_err(&pdev->dev, "failed to register cpuidle device\n"); |
