From 8968561242491375a6f1d66e92c774f503cf70f8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 5 Jan 2024 15:43:42 +0000 Subject: [PATCH] ANDROID: fix crc error in put_cmsg caused in 6.1.68 In commit f2f57f51b53b ("io_uring/af_unix: disable sending io_uring over sockets") a new .h file was added to the include list, which broke the crc generation checks with the following error: function symbol 'int put_cmsg(struct msghdr*, int, int, int, void*)' changed CRC changed from 0x31108fe3 to 0xd66fe827 Fix this by only including the .h file if the crc checker is not being run. Bug: 161946584 Fixes: f2f57f51b53b ("io_uring/af_unix: disable sending io_uring over sockets") Change-Id: Ie7a6d5627f169a0fea3eac2b43024cff977b8360 Signed-off-by: Greg Kroah-Hartman --- net/core/scm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/core/scm.c b/net/core/scm.c index e762a4b8a1d2..8effe039fc51 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -26,7 +26,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif #include