From 8ad88eae4b6914c512569b10c19e04754def1746 Mon Sep 17 00:00:00 2001
From: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
Date: Thu, 8 Dec 2022 15:05:08 +0530
Subject: [PATCH] ANDROID: dma-buf: Fix build breakage with
 !CONFIG_DMABUF_SYSFS_STATS

The commit c5589c7eec41 ("ANDROID: dma-buf: Add vendor hook for
deferred dmabuf sysfs stats release") introduced a build breakage
on non-GKI targets which don't have CONFIG_DMABUF_SYSFS_STATS
enabled. It is due to invisibility of struct dma_buf_sysfs_entry
in the trace hook header file. We can get away with it by moving
the header inclusion from trace hook header to vendor hooks driver.

Bug: 261818075
Change-Id: Ibb79bd67c9f1b36fe2b5d569ab9369f376a78b77
Signed-off-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
---
 drivers/android/vendor_hooks.c | 1 +
 include/trace/hooks/dmabuf.h   | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 12066949e275..91288f59a390 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -7,6 +7,7 @@
  */
 
 #ifndef __GENKSYMS__
+#include <linux/dma-buf.h>
 #include <linux/rmap.h>
 #endif
 
diff --git a/include/trace/hooks/dmabuf.h b/include/trace/hooks/dmabuf.h
index 8963742273bc..0182960efca2 100644
--- a/include/trace/hooks/dmabuf.h
+++ b/include/trace/hooks/dmabuf.h
@@ -11,13 +11,7 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#ifdef __GENKSYMS__
 struct dma_buf_sysfs_entry;
-#else
-/* struct dma_buf_sysfs_entry */
-#include <linux/dma-buf.h>
-#endif
-
 DECLARE_RESTRICTED_HOOK(android_rvh_dma_buf_stats_teardown,
 	TP_PROTO(struct dma_buf_sysfs_entry *sysfs_entry, bool *skip_sysfs_release),
 	TP_ARGS(sysfs_entry, skip_sysfs_release), 1);