1 files changed, 7 insertions, 7 deletions

diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h
index 7453c1281531..a13b031dc6b8 100644
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
@@ -18,13 +18,6 @@
 
 struct bpf_reg_state {
         enum bpf_reg_type type;
-        /*
-         * Used to determine if any memory access using this register will
-         * result in a bad access.
-         */
-        s64 min_value;
-        u64 max_value;
-        u32 id;
         union {
                 /* valid when type == CONST_IMM | PTR_TO_STACK | UNKNOWN_VALUE */
                 s64 imm;
@@ -40,6 +33,13 @@ struct bpf_reg_state {
                  */
                 struct bpf_map *map_ptr;
         };
+        u32 id;
+        /* Used to determine if any memory access using this register will
+         * result in a bad access. These two fields must be last.
+         * See states_equal()
+         */
+        s64 min_value;
+        u64 max_value;
 };
 
 enum bpf_stack_slot_type {