From 57791321adb08d2888757466e0b0d9c54e7e5722 Mon Sep 17 00:00:00 2001
From: "yang.yang29@zte.com.cn" <yang.yang29@zte.com.cn>
Date: Wed, 7 Jun 2023 11:21:29 +0800
Subject: [PATCH 1/3] pid.h: include atomic.h

commit 5e16582aa3ade481ac6b23ffe90016f2d285f18a upstream.

This patch fixes build error:
  CC      kernel/pid_namespace.o
In file included from kernel/pid_namespace.c:11:0:
include/linux/pid.h: In function 'get_pid':
include/linux/pid.h:78:3: error: implicit declaration of function 'atomic_inc' [-Werror=implicit-function-declaration]
   atomic_inc(&pid->count);
   ^
which happens when
 CONFIG_PROVE_LOCKING=n
 CONFIG_DEBUG_SPINLOCK=n
 CONFIG_DEBUG_MUTEXES=n
 CONFIG_DEBUG_LOCK_ALLOC=n
 CONFIG_PID_NS=y

Vanilla gets this via spinlock.h.

Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 include/linux/pid.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/pid.h b/include/linux/pid.h
index 387874c72b07..50b02e6aecfc 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -5,6 +5,7 @@
 #include <linux/rculist.h>
 #include <linux/wait.h>
 #include <linux/signal.h>
+#include <linux/atomic.h>
 
 enum pid_type
 {
-- 
Gitee


From af9c3d506ad4fa11ee681bf2db905267cd07e5b7 Mon Sep 17 00:00:00 2001
From: "yang.yang29@zte.com.cn" <yang.yang29@zte.com.cn>
Date: Wed, 7 Jun 2023 11:22:10 +0800
Subject: [PATCH 2/3] arm: include definition for cpumask_t

commit e104dba071027b30e97bc63e57da11ad26516141 upstream.

This definition gets pulled in by other files. With the (later) split of
RCU and spinlock.h it won't compile anymore.
The split is done in ("rbtree: don't include the rcu header").

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 arch/arm/include/asm/irq.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index 46d41140df27..c421b5b81946 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -23,6 +23,8 @@
 #endif
 
 #ifndef __ASSEMBLY__
+#include <linux/cpumask.h>
+
 struct irqaction;
 struct pt_regs;
 
-- 
Gitee


From 3c52d3453b4dcaebeaa0a431dc953dc627308a45 Mon Sep 17 00:00:00 2001
From: "yang.yang29@zte.com.cn" <yang.yang29@zte.com.cn>
Date: Wed, 7 Jun 2023 11:22:25 +0800
Subject: [PATCH 3/3] locking: locktorture: Do NOT include rwlock.h  directly

commit 002db8d9c11d02194c1e281091b8b577b9f36014 upstream.

Including rwlock.h directly will cause kernel builds to fail
if CONFIG_PREEMPT_RT_FULL is defined. The correct header file
(rwlock_rt.h OR rwlock.h) will be included by spinlock.h which
is included by locktorture.c anyway.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Wolfgang M. Reimer <linuxball@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 kernel/locking/locktorture.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 7d0b0ed74404..a81e6ef33a04 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -29,7 +29,6 @@
 #include <linux/kthread.h>
 #include <linux/sched/rt.h>
 #include <linux/spinlock.h>
-#include <linux/rwlock.h>
 #include <linux/mutex.h>
 #include <linux/rwsem.h>
 #include <linux/smp.h>
-- 
Gitee