Merge release-20200928.0-72-g6bad4851d (automated)

1 files changed, 3 insertions, 0 deletions

diff --git a/pkg/sentry/mm/mm_state_autogen.go b/pkg/sentry/mm/mm_state_autogen.go
index 1636e5235..1fe9dfd7f 100644
--- a/pkg/sentry/mm/mm_state_autogen.go
+++ b/pkg/sentry/mm/mm_state_autogen.go
@@ -316,6 +316,7 @@ func (m *MemoryManager) StateFields() []string {
 		"sleepForActivation",
 		"vdsoSigReturnAddr",
 		"membarrierPrivateEnabled",
+		"membarrierRSeqEnabled",
 	}
 }
 
@@ -350,6 +351,7 @@ func (m *MemoryManager) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(20, &m.sleepForActivation)
 	stateSinkObject.Save(21, &m.vdsoSigReturnAddr)
 	stateSinkObject.Save(22, &m.membarrierPrivateEnabled)
+	stateSinkObject.Save(23, &m.membarrierRSeqEnabled)
 }
 
 func (m *MemoryManager) StateLoad(stateSourceObject state.Source) {
@@ -376,6 +378,7 @@ func (m *MemoryManager) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(20, &m.sleepForActivation)
 	stateSourceObject.Load(21, &m.vdsoSigReturnAddr)
 	stateSourceObject.Load(22, &m.membarrierPrivateEnabled)
+	stateSourceObject.Load(23, &m.membarrierRSeqEnabled)
 	stateSourceObject.AfterLoad(m.afterLoad)
 }