ANDROID: GKI: Update ABI for zsmalloc fixes

zs_pool->lock was added upstream as a replacement for the size_class
locks.

The tooling over-cautiously reports this as a ABI breakage but both
of these structs (zs_pool and size_class) are internal to zsmalloc.c.

Update the ABI to allow these changes.

Bug: 297093100
Change-Id: Ib9fc5a036f75d89fb6bee4c146034f6c81759e04
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
Kalesh Singh
2023-08-25 09:58:36 -07:00
parent cb440cecb2
commit 797dac42cc

View File

@@ -91948,10 +91948,9 @@ member {
offset: 712 offset: 712
} }
member { member {
id: 0xf667d80f id: 0xf667dcee
name: "fullness_list" name: "fullness_list"
type_id: 0xb8bf135c type_id: 0xb8bf135c
offset: 64
} }
member { member {
id: 0xfeb50ea0 id: 0xfeb50ea0
@@ -103779,12 +103778,6 @@ member {
type_id: 0x4585663f type_id: 0x4585663f
offset: 320 offset: 320
} }
member {
id: 0xad7c8a98
name: "index"
type_id: 0x4585663f
offset: 672
}
member { member {
id: 0xad7c8ba4 id: 0xad7c8ba4
name: "index" name: "index"
@@ -103797,6 +103790,12 @@ member {
type_id: 0x4585663f type_id: 0x4585663f
offset: 480 offset: 480
} }
member {
id: 0xad7c8d2b
name: "index"
type_id: 0x4585663f
offset: 608
}
member { member {
id: 0xad7c8d72 id: 0xad7c8d72
name: "index" name: "index"
@@ -115578,6 +115577,12 @@ member {
type_id: 0xf313e71a type_id: 0xf313e71a
offset: 768 offset: 768
} }
member {
id: 0x2d1fe43b
name: "lock"
type_id: 0xf313e71a
offset: 17536
}
member { member {
id: 0x2d1fe44c id: 0x2d1fe44c
name: "lock" name: "lock"
@@ -123438,12 +123443,6 @@ member {
type_id: 0x2c8b0a9f type_id: 0x2c8b0a9f
offset: 768 offset: 768
} }
member {
id: 0xdb33fcdf
name: "migrate_lock"
type_id: 0xf4933b90
offset: 17536
}
member { member {
id: 0x8edaa968 id: 0x8edaa968
name: "migrate_page" name: "migrate_page"
@@ -136400,10 +136399,10 @@ member {
type_id: 0xad7c0a89 type_id: 0xad7c0a89
} }
member { member {
id: 0x7a226550 id: 0x7a226b7d
name: "objs_per_zspage" name: "objs_per_zspage"
type_id: 0x6720d32f type_id: 0x6720d32f
offset: 608 offset: 544
} }
member { member {
id: 0x33953b25 id: 0x33953b25
@@ -141342,10 +141341,10 @@ member {
bitsize: 1 bitsize: 1
} }
member { member {
id: 0x338646f2 id: 0x338649f9
name: "pages_per_zspage" name: "pages_per_zspage"
type_id: 0x6720d32f type_id: 0x6720d32f
offset: 640 offset: 576
} }
member { member {
id: 0xf9521fd2 id: 0xf9521fd2
@@ -173982,18 +173981,18 @@ member {
type_id: 0x6720d32f type_id: 0x6720d32f
offset: 96 offset: 96
} }
member {
id: 0xd91935d3
name: "size"
type_id: 0x6720d32f
offset: 576
}
member { member {
id: 0xd9193607 id: 0xd9193607
name: "size" name: "size"
type_id: 0x6720d32f type_id: 0x6720d32f
offset: 896 offset: 896
} }
member {
id: 0xd91937b9
name: "size"
type_id: 0x6720d32f
offset: 512
}
member { member {
id: 0xd9193b66 id: 0xd9193b66
name: "size" name: "size"
@@ -179931,10 +179930,10 @@ member {
offset: 896 offset: 896
} }
member { member {
id: 0xb91e0d04 id: 0xb91e0940
name: "stats" name: "stats"
type_id: 0x6b61371d type_id: 0x6b61371d
offset: 704 offset: 640
} }
member { member {
id: 0xb920e0d3 id: 0xb920e0d3
@@ -249070,14 +249069,13 @@ struct_union {
kind: STRUCT kind: STRUCT
name: "size_class" name: "size_class"
definition { definition {
bytesize: 136 bytesize: 128
member_id: 0x2d1fec85 member_id: 0xf667dcee
member_id: 0xf667d80f member_id: 0xd91937b9
member_id: 0xd91935d3 member_id: 0x7a226b7d
member_id: 0x7a226550 member_id: 0x338649f9
member_id: 0x338646f2 member_id: 0xad7c8d2b
member_id: 0xad7c8a98 member_id: 0xb91e0940
member_id: 0xb91e0d04
} }
} }
struct_union { struct_union {
@@ -265101,7 +265099,7 @@ struct_union {
member_id: 0xb9089225 member_id: 0xb9089225
member_id: 0x868caa9e member_id: 0x868caa9e
member_id: 0x8a67a9e5 member_id: 0x8a67a9e5
member_id: 0xdb33fcdf member_id: 0x2d1fe43b
} }
} }
struct_union { struct_union {