diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 23:15:34 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 23:15:34 +0000 |
| commit | 646b2c57c36be2cc93f75f0855f82b3b2d6db5dc (patch) | |
| tree | bbb7d3228b2d1bc6eab9716d3b6587239a842b73 /pkg/sentry | |
| parent | fada85b4327be60de0b63163acf02ba235423064 (diff) | |
| parent | 7eeeff4268384a7aa87ab5aa6d57ac89711bcbff (diff) | |
Merge release-20200928.0-113-g7eeeff426 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_impl_arm64.s | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 6a8376032..05ff9ebd9 100644 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -116,10 +116,11 @@ #define SCTLR_M 1 << 0 #define SCTLR_C 1 << 2 #define SCTLR_I 1 << 12 +#define SCTLR_DZE 1 << 14 #define SCTLR_UCT 1 << 15 #define SCTLR_UCI 1 << 26 -#define SCTLR_EL1_DEFAULT (SCTLR_M | SCTLR_C | SCTLR_I | SCTLR_UCT | SCTLR_UCI) +#define SCTLR_EL1_DEFAULT (SCTLR_M | SCTLR_C | SCTLR_I | SCTLR_UCT | SCTLR_UCI | SCTLR_DZE) // cntkctl_el1: counter-timer kernel control register el1. #define CNTKCTL_EL0PCTEN 1 << 0 |