From 7b80f1156325b720db26bda93cee7dbf6a9460c7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Mar 2021 10:09:14 +0100 Subject: [PATCH] ANDROID: GKI: hack up fs/sysfs/file.c to prevent GENKSYMS change In commit 5f4243642873 ("sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output") in 5.4.103, a #include addition is added to the fs/sysfs/file.c file, before sysfs.h is included in the build. This ends up causing a previously "UNKNOWN" symbol type definition of struct vm_operations_struct to become "known" which propagates to a CRC change for some sysfs symbol definitions. To prevent all this mess, add a simple #ifndef to prevent the mm.h file from being included when running the symbol tool, and all is fine. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Ibcc22bedc4f39d2ef49a52ebd7962a8dba5b0583 --- fs/sysfs/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 4f7cf975b27c..d79afaffcbca 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -15,7 +15,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif #include "sysfs.h"