From a6fd90fb31fb3a9e1b643afc356b38e5a7ed2b09 Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Fri, 30 Sep 2022 09:08:15 +0000
Subject: [PATCH] ivc: Add wrapper header for ivc.h to avoid multiple inclusion

The ivc.h is not protected for multiple inclusion and so
it is generating error for multiple definition when included
from the source code.

Add wrapper header to protect the multiple inclusion of the ivc.h.

This will make the OOT driers to compile against all core kernel
which does not have proper ivc.h fix.

Change-Id: Ibe85da017d60f525b05d04cd6a5ea15c5b312057
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2784877
Reviewed-by: Manish Bhardwaj <mbhardwaj@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/block/tegra_virt_storage/tegra_vblk.h |  2 +-
 include/soc/tegra/ivc-priv.h                  | 11 +++++++++++
 include/soc/tegra/ivc_ext.h                   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 include/soc/tegra/ivc-priv.h

diff --git a/drivers/block/tegra_virt_storage/tegra_vblk.h b/drivers/block/tegra_virt_storage/tegra_vblk.h
index ce983d33..94ddcb8c 100644
--- a/drivers/block/tegra_virt_storage/tegra_vblk.h
+++ b/drivers/block/tegra_virt_storage/tegra_vblk.h
@@ -10,7 +10,7 @@
 #include <linux/blkdev.h>
 #include <linux/blk-mq.h>
 #include <linux/bio.h>
-#include <soc/tegra/ivc.h>
+#include <soc/tegra/ivc-priv.h>
 #include <soc/tegra/ivc_ext.h>
 #include <soc/tegra/virt/hv-ivc.h>
 #include <linux/workqueue.h>
diff --git a/include/soc/tegra/ivc-priv.h b/include/soc/tegra/ivc-priv.h
new file mode 100644
index 00000000..d331be11
--- /dev/null
+++ b/include/soc/tegra/ivc-priv.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ */
+
+#ifndef __TEGRA_IVC_PRIV_H
+#define __TEGRA_IVC_PRIV_H
+
+#include <soc/tegra/ivc.h>
+
+#endif /* __TEGRA_IVC_PRIV_H */
diff --git a/include/soc/tegra/ivc_ext.h b/include/soc/tegra/ivc_ext.h
index 4dbfbecb..d005515b 100644
--- a/include/soc/tegra/ivc_ext.h
+++ b/include/soc/tegra/ivc_ext.h
@@ -7,7 +7,7 @@
 #define __TEGRA_IVC_EXT_H
 
 #include <linux/types.h>
-#include <soc/tegra/ivc.h>
+#include <soc/tegra/ivc-priv.h>
 
 /**
  * tegra_ivc_channel_notified - notifies the peer device