diff options
| author | Sudeep Holla <sudeep.holla@arm.com> | 2015-07-31 17:41:36 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-07-31 18:40:52 +0200 |
| commit | b511a6592860f24725f34909392885c4e3e9fe95 (patch) | |
| tree | 3465d37ce38ce54d1d293b96af9b36b84ae39068 /arch/arm64/kernel | |
| parent | ARM64: PCI: do not enable resources on PROBE_ONLY systems (diff) | |
| download | linux-b511a6592860f24725f34909392885c4e3e9fe95.tar.xz linux-b511a6592860f24725f34909392885c4e3e9fe95.zip | |
arm64: restore cpu suspend/resume functionality
Commit 4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
accidentally retained code for !CONFIG_SMP in cpu_resume function. This
resulted in the hash index being zeroed in x7 after proper computation,
which is then used to get the cpu context pointer while resuming.
This patch removes the remanant code and restores back the cpu suspend/
resume functionality.
Fixes: 4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/sleep.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/sleep.S b/arch/arm64/kernel/sleep.S index 5686a3ae3940..fb3128ea3a4f 100644 --- a/arch/arm64/kernel/sleep.S +++ b/arch/arm64/kernel/sleep.S @@ -158,7 +158,6 @@ ENTRY(cpu_resume) ldp w5, w6, [x8, #(MPIDR_HASH_SHIFTS + 8)] compute_mpidr_hash x7, x3, x4, x5, x6, x1, x2 /* x7 contains hash index, let's use it to grab context pointer */ - mov x7, xzr ldr_l x0, sleep_save_sp + SLEEP_SAVE_SP_PHYS ldr x0, [x0, x7, lsl #3] /* load sp from context */ |