From fcc48c2254a047b85cdbb5a4939a1f80f2c04b47 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sat, 2 Jul 2022 11:26:26 +0800
Subject: [PATCH] arch/arm: Don't include arch/arch.h in include/irq.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 arch/arm/include/armv7-a/irq.h    | 1 -
 arch/arm/include/armv7-r/irq.h    | 1 -
 arch/x86_64/include/intel64/irq.h | 3 ++-
 include/nuttx/sched.h             | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/armv7-a/irq.h b/arch/arm/include/armv7-a/irq.h
index e89d4d095c..abd083346b 100644
--- a/arch/arm/include/armv7-a/irq.h
+++ b/arch/arm/include/armv7-a/irq.h
@@ -34,7 +34,6 @@
 
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
-#  include <arch/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/include/armv7-r/irq.h b/arch/arm/include/armv7-r/irq.h
index 06a7919b89..64faba4f18 100644
--- a/arch/arm/include/armv7-r/irq.h
+++ b/arch/arm/include/armv7-r/irq.h
@@ -34,7 +34,6 @@
 
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
-#  include <arch/arch.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86_64/include/intel64/irq.h b/arch/x86_64/include/intel64/irq.h
index 4f843c43cb..55786caa50 100644
--- a/arch/x86_64/include/intel64/irq.h
+++ b/arch/x86_64/include/intel64/irq.h
@@ -29,12 +29,13 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/config.h>
+
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
 #  include <stdbool.h>
 #  include <arch/arch.h>
 #  include <time.h>
-#  include <nuttx/config.h>
 #endif
 
 /****************************************************************************
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 99bec382e8..c762c4bea0 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -43,6 +43,8 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 
+#include <arch/arch.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/