From 83f60b3043f236b51bda87e7c09116748c61a811 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 23 Jul 2020 08:45:11 +0200 Subject: [PATCH] ANDROID: GKI: preserve ABI for struct sock_cgroup_data In commit ad0f75e5f57c ("cgroup: fix cgroup_sk_alloc() for sk_clone_lock()") the struct sock_cgroup_data fields are changed a bit, in a way that keeps the same size and functionality, it just packs another bit into the structure. Because this does not really change the abi, tell the genksyms detector that nothing has changed so that the ABI checker is happy. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Ibc748616140ac0da69b04699cfd2322dc4e5d1f4 Signed-off-by: Will McVicker --- include/linux/cgroup-defs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 454ea4f351c9..7112b8a1faaa 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -763,9 +763,13 @@ struct sock_cgroup_data { union { #ifdef __LITTLE_ENDIAN struct { +#ifdef __GENKSYMS__ + u8 is_data; +#else u8 is_data : 1; u8 no_refcnt : 1; u8 unused : 6; +#endif u8 padding; u16 prioidx; u32 classid;