diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 592ed1d265d7..26aae9e95c4d 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -71070,10 +71070,10 @@ member {
   type_id: 0x0484940b
 }
 member {
-  id: 0x11d6bf1f
+  id: 0x11d6b697
   name: "count_unix"
   type_id: 0xb0312d5a
-  offset: 16320
+  offset: 16448
 }
 member {
   id: 0x20014498
@@ -212532,6 +212532,12 @@ member {
   type_id: 0xe8034002
   offset: 16
 }
+member {
+  id: 0x7b11d7cc
+  name: "vertices"
+  type_id: 0xd3c80119
+  offset: 16320
+}
 member {
   id: 0x444fc004
   name: "vet_description"
@@ -266814,12 +266820,13 @@ struct_union {
   kind: STRUCT
   name: "scm_fp_list"
   definition {
-    bytesize: 2048
+    bytesize: 2064
     member_id: 0x65956ee9
     member_id: 0x97463852
     member_id: 0x042a2402
     member_id: 0x5449f846
-    member_id: 0x11d6bf1f
+    member_id: 0x7b11d7cc
+    member_id: 0x11d6b697
   }
 }
 struct_union {
diff --git a/android/abi_gki_aarch64.stg.allowed_breaks b/android/abi_gki_aarch64.stg.allowed_breaks
index 5c9bf6aa3ce6..5e7659cb7aa3 100644
--- a/android/abi_gki_aarch64.stg.allowed_breaks
+++ b/android/abi_gki_aarch64.stg.allowed_breaks
@@ -144,3 +144,10 @@ type 'struct kvm_hyp_req' changed
 type 'struct scm_fp_list' changed
   byte size changed from 2040 to 2048
   member 'short count_unix' was added
+
+type 'struct scm_fp_list' changed
+  byte size changed from 2048 to 2064
+  member 'struct list_head vertices' was added
+  member 'short count_unix' changed
+    offset changed by 128
+
diff --git a/include/net/scm.h b/include/net/scm.h
index bb717ec73203..c93ef577d20d 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -25,12 +25,12 @@ struct scm_creds {
 struct scm_fp_list {
 	short			count;
 	short			max;
-#ifdef CONFIG_UNIX
-	struct list_head	vertices;
-#endif
 	struct user_struct	*user;
 	struct file		*fp[SCM_MAX_FD];
 #ifndef __GENKSYMS__
+#ifdef CONFIG_UNIX
+	struct list_head	vertices;
+#endif
 	short			count_unix;
 #endif
 };