Re: <linux/wait.h> uses definitions from <linux/sched.h> (was Re: 2.6.21-rc6-mm1)

[Stefan Richter <stefanr@s5r6.in-berlin.de>]

I wrote at lkml:
> Torsten Kaiser wrote:
>> drivers/ieee1394/ieee1394_transactions.c fails for me if CONFIG_SMP=n
>> 
>> gcc complains:
>>  CC      drivers/ieee1394/ieee1394_transactions.o
>> drivers/ieee1394/ieee1394_transactions.c: In function 'hpsb_get_tlabel':
>> drivers/ieee1394/ieee1394_transactions.c:183: error:
>> 'TASK_INTERRUPTIBLE' undeclared (first use in this function)
> [...]
>> I fixed this by adding #include <linux/sched.h> before #include
>> <linux/wait.h>
>> But that is probably not the correct fix, but gives me a working kernel.
> 
> Thanks, I'll add this to linux1394-2.6.git (which exposed the problem)
> ASAP.  On the other hand, the culprit is actually include/linux/wait.h
> which IMO should include the headers it needs for itself.

And while I am at it:


From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: some more includes

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/ieee1394/ieee1394_transactions.c |    3 +++
 1 file changed, 3 insertions(+)

Index: linux/drivers/ieee1394/ieee1394_transactions.c
===================================================================
--- linux.orig/drivers/ieee1394/ieee1394_transactions.c
+++ linux/drivers/ieee1394/ieee1394_transactions.c
@@ -10,13 +10,16 @@
  */
 
 #include <linux/bitops.h>
+#include <linux/compiler.h>
 #include <linux/hardirq.h>
 #include <linux/spinlock.h>
+#include <linux/string.h>
 #include <linux/sched.h>  /* because linux/wait.h is broken if CONFIG_SMP=n */
 #include <linux/wait.h>
 
 #include <asm/bug.h>
 #include <asm/errno.h>
+#include <asm/system.h>
 
 #include "ieee1394.h"
 #include "ieee1394_types.h"


-- 
Stefan Richter
-=====-=-=== -=-- -=--=
http://arcgraph.de/sr/