projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[cascardo/linux.git]
/
arch
/
arm64
/
kernel
/
psci.c
diff --git
a/arch/arm64/kernel/psci.c
b/arch/arm64/kernel/psci.c
index
3425f31
..
f1dbca7
100644
(file)
--- a/
arch/arm64/kernel/psci.c
+++ b/
arch/arm64/kernel/psci.c
@@
-540,6
+540,8
@@
const struct cpu_operations cpu_psci_ops = {
.name = "psci",
#ifdef CONFIG_CPU_IDLE
.cpu_init_idle = cpu_psci_cpu_init_idle,
+#endif
+#ifdef CONFIG_ARM64_CPU_SUSPEND
.cpu_suspend = cpu_psci_cpu_suspend,
#endif
#ifdef CONFIG_SMP