From a6a081329582c6795e3b68104bd770d03e5d4f45 Mon Sep 17 00:00:00 2001
From: Kajetan Puchalski <kajetan.puchalski@arm.com>
Date: Wed, 16 Aug 2023 12:11:13 +0100
Subject: [PATCH] lisa/_assets/kmodules/lisa: Include in-tree headers in
 sched_helpers.h

Fold including internal kernel headers required for the in-tree
build into sched_helpers.h. This way including sched_helpers.h will work
on its own in both workflows instead of requiring duplicated defines
wherever it is used.

Signed-off-by: Kajetan Puchalski <kajetan.puchalski@arm.com>
---
 lisa/_assets/kmodules/lisa/pixel6.c        | 5 -----
 lisa/_assets/kmodules/lisa/sched_helpers.h | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lisa/_assets/kmodules/lisa/pixel6.c b/lisa/_assets/kmodules/lisa/pixel6.c
index 1fdd0e9d1..142482b3f 100644
--- a/lisa/_assets/kmodules/lisa/pixel6.c
+++ b/lisa/_assets/kmodules/lisa/pixel6.c
@@ -4,11 +4,6 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 
-#ifdef _IN_TREE_BUILD
-#include <linux/sched/cputime.h>
-#include <kernel/sched/sched.h>
-#endif
-
 #include "main.h"
 #include "features.h"
 #include "wq.h"
diff --git a/lisa/_assets/kmodules/lisa/sched_helpers.h b/lisa/_assets/kmodules/lisa/sched_helpers.h
index 23099eb5b..e1201e827 100644
--- a/lisa/_assets/kmodules/lisa/sched_helpers.h
+++ b/lisa/_assets/kmodules/lisa/sched_helpers.h
@@ -9,6 +9,8 @@
 
 #ifdef _IN_TREE_BUILD
 
+#include <linux/sched/cputime.h>
+#include <kernel/sched/sched.h>
 #include <kernel/sched/autogroup.h>
 
 #else
-- 
GitLab