From 55972ed83a43014ccb3a1d6cac057d4e07041c5b Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 1 Jul 2025 23:44:43 +0000 Subject: [PATCH] ANDROID: Fixup init_user_ns CRC change The previous patch, by including the new trace/hooks/users.h file causes other heads to be included which sligtly change the declaration typing info for a number types to not be opaque types. This results in the struct user_namespace init_user_ns value to get a different CRC result. To address this, use the ANDROID_KABI_DECLONLY macro to clarify the affected types are only considered to be delared. This can hopefully be dropped during a future KABI thaw. Bug: 425550656 Change-Id: I18c463535b04e766777f7ebb8115fedf8e8f0c00 Signed-off-by: John Stultz --- kernel/user.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/user.c b/kernel/user.c index 2953e21df57f..c69fb4764706 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -22,6 +22,17 @@ #include #include +#include + +ANDROID_KABI_DECLONLY(address_space); +ANDROID_KABI_DECLONLY(cred); +ANDROID_KABI_DECLONLY(dentry); +ANDROID_KABI_DECLONLY(file); +ANDROID_KABI_DECLONLY(io_context); +ANDROID_KABI_DECLONLY(module); +ANDROID_KABI_DECLONLY(pid); +ANDROID_KABI_DECLONLY(sighand_struct); +ANDROID_KABI_DECLONLY(signal_struct); #if IS_ENABLED(CONFIG_BINFMT_MISC) struct binfmt_misc init_binfmt_misc = {