diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-13 16:12:20 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-13 16:12:20 -0700 |
| commit | 7eeeff4268384a7aa87ab5aa6d57ac89711bcbff (patch) | |
| tree | 9e0b76aca847cbf31657ab976a48b28ea0959ae4 /pkg/sentry | |
| parent | 443e3cad4a46fbb37d2a228cb501f223c54fc636 (diff) | |
| parent | 2ae97b27aa385ddb51c234ec31fb4c4869c0088a (diff) | |
Merge pull request #4482 from lemin9538:lemin_arm64
PiperOrigin-RevId: 336976081
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_arm64.s | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 274576e2d..2370a9276 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -46,10 +46,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 |