summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/suspend.h
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2020-04-27 09:00:12 -0700
committerWill Deacon <will@kernel.org>2020-05-15 16:35:50 +0100
commit6d37d81f449a103a8b43c5c972b5055b8936ef0e (patch)
tree86b92094d4b520b008f4545bf7f1e97bddaa1d68 /arch/arm64/include/asm/suspend.h
parentda64e9d1f8c3dad6898dac6edb39a68d3aa9ce93 (diff)
arm64: Preserve register x18 when CPU is suspended
Don't lose the current task's shadow stack when the CPU is suspended. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/suspend.h')
-rw-r--r--arch/arm64/include/asm/suspend.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/suspend.h b/arch/arm64/include/asm/suspend.h
index 8939c87c4dce..0cde2f473971 100644
--- a/arch/arm64/include/asm/suspend.h
+++ b/arch/arm64/include/asm/suspend.h
@@ -2,7 +2,7 @@
#ifndef __ASM_SUSPEND_H
#define __ASM_SUSPEND_H
-#define NR_CTX_REGS 12
+#define NR_CTX_REGS 13
#define NR_CALLEE_SAVED_REGS 12
/*