From 74b3b9d3c44075dbc72da8992d935db62b3cf3d6 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 14 Dec 2021 14:46:45 -0500
Subject: [PATCH] fix: isystem: delete global -isystem compile option (v5.16)

See upstream commit :

  commit 04e85bbf71c9072dcf0ad9a7150495d72461105c
  Author: Alexey Dobriyan <adobriyan@gmail.com>
  Date:   Mon Aug 2 23:43:15 2021 +0300

    isystem: delete global -isystem compile option

    Further isolate kernel from userspace, prevent accidental inclusion of
    undesireable headers, mainly float.h and stdatomic.h.

    nds32 keeps -isystem globally due to intrinsics used in entrenched header.

    -isystem is selectively reenabled for some files, again, for intrinsics.

Change-Id: I5bea29687dc2bc15e96eeb13008aefe1acc97b8a
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 lttng-events.c       | 6 ++++++
 lttng-string-utils.h | 2 --
 lttng-tracer.h       | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lttng-events.c b/lttng-events.c
index 60f5623b..9462877d 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -46,6 +46,12 @@
 #include <wrapper/ringbuffer/frontend.h>
 #include <wrapper/time.h>
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0))
+#include <linux/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
+
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
 static LIST_HEAD(sessions);
diff --git a/lttng-string-utils.h b/lttng-string-utils.h
index 0f8ba793..145aefa8 100644
--- a/lttng-string-utils.h
+++ b/lttng-string-utils.h
@@ -6,8 +6,6 @@
  * Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
-#include <stdbool.h>
-
 typedef char (*strutils_get_char_at_cb)(size_t, void *);
 
 bool strutils_is_star_glob_pattern(const char *pattern);
diff --git a/lttng-tracer.h b/lttng-tracer.h
index a006f23e..6348b8af 100644
--- a/lttng-tracer.h
+++ b/lttng-tracer.h
@@ -11,7 +11,6 @@
  * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <stdarg.h>
 #include <linux/types.h>
 #include <linux/limits.h>
 #include <linux/list.h>
-- 
2.34.1