diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-22 22:59:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-22 22:59:35 +0000 |
| commit | 7d98fc2a4bd23cb0ed0ea7f9c24deebc312e7d35 (patch) | |
| tree | 914275161e9f675ab8b0592e030f8610d3ecf17f | |
| parent | 967be575f24955d64e7a8b8e5b83ca23f0a5f0e1 (diff) | |
| parent | 0690c25e062ad1b8dc162b4b4d70ab59879b9bff (diff) | |
Merge release-20210712.0-52-g0690c25e0 (automated)
| -rw-r--r-- | pkg/ring0/defs_impl_amd64.go | 1 | ||||
| -rw-r--r-- | pkg/ring0/kernel_amd64.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/ring0/defs_impl_amd64.go b/pkg/ring0/defs_impl_amd64.go index 8005c6d94..97d13e682 100644 --- a/pkg/ring0/defs_impl_amd64.go +++ b/pkg/ring0/defs_impl_amd64.go @@ -326,6 +326,7 @@ func Emit(w io.Writer) { const ( _CR0_PE = 1 << 0 _CR0_ET = 1 << 4 + _CR0_NE = 1 << 5 _CR0_AM = 1 << 18 _CR0_PG = 1 << 31 diff --git a/pkg/ring0/kernel_amd64.go b/pkg/ring0/kernel_amd64.go index 23ec33f92..4a4c0ae26 100644 --- a/pkg/ring0/kernel_amd64.go +++ b/pkg/ring0/kernel_amd64.go @@ -177,7 +177,7 @@ func (c *CPU) TSS() (uint64, uint16, *SegmentDescriptor) { // //go:nosplit func (c *CPU) CR0() uint64 { - return _CR0_PE | _CR0_PG | _CR0_AM | _CR0_ET + return _CR0_PE | _CR0_PG | _CR0_AM | _CR0_ET | _CR0_NE } // CR4 returns the CPU's CR4 value. |