diff options
| author | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
| commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
| tree | a70d939eabed2e19538707402441644dfc26990e /arch/arm64/kernel/psci.c | |
| parent | percpu: Convert remaining __get_cpu_var uses in 3.18-rcX (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.xz linux-cceb9bd63373061ad7b75c321808a2fb11c86545.zip | |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
| -rw-r--r-- | arch/arm64/kernel/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index d56394b6dc99..3425f311c49e 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -528,7 +528,7 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) if (WARN_ON_ONCE(!index)) return -EINVAL; - if (state->type == PSCI_POWER_STATE_TYPE_STANDBY) + if (state[index - 1].type == PSCI_POWER_STATE_TYPE_STANDBY) ret = psci_ops.cpu_suspend(state[index - 1], 0); else ret = __cpu_suspend(index, psci_suspend_finisher); |