From 064715b2265f792a4f712c6c1681dcc8f403e2a2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 25 Sep 2004 02:33:08 +0100 Subject: [ARM] Fix circular include dependency in asm/system.h The recent addition of linux/bitops.h inside linux/kernel.h has created a circular dependency: asm/system.h -> linux/kernel.h -> linux/bitops.h -> asm/bitops.h -> asm/system.h which results in an unbuildable kernel. We appear not to need linux/kernel.h in asm/system.h, but do need linux/linkage.h, so make this the case. --- include/asm-arm/system.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 146a814e53a2..cafe9531cf01 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -98,9 +98,10 @@ #ifndef __ASSEMBLY__ -#include +#include struct thread_info; +struct task_struct; /* information about the system we're running on */ extern unsigned int system_rev; @@ -203,8 +204,6 @@ do { \ * `prev' will never be the same as `next'. schedule() itself * contains the memory barrier to tell GCC not to cache `current'. */ -struct thread_info; -struct task_struct; extern struct task_struct *__switch_to(struct task_struct *, struct thread_info *, struct thread_info *); #define switch_to(prev,next,last) \ -- cgit v1.2.3