2009-10-12 21:11:17

by Jeff Mahoney

[permalink] [raw]
Subject: [PATCH] staging: Complete sched.h removal from interrupt.h

Commit d43c36dc removed sched.h from interrupt.h and distributed sched.h
to users which needed it. This finishes it up for staging.

Signed-off-by: Jeff Mahoney <[email protected]>
---
drivers/staging/b3dfg/b3dfg.c | 1 +
drivers/staging/hv/osd.c | 1 +
drivers/staging/iio/industrialio-core.c | 2 ++
drivers/staging/poch/poch.c | 1 +
drivers/staging/sep/sep_driver.c | 1 +
drivers/staging/vme/bridges/vme_ca91cx42.c | 1 +
drivers/staging/vme/bridges/vme_tsi148.c | 1 +
7 files changed, 8 insertions(+)

--- a/drivers/staging/b3dfg/b3dfg.c
+++ b/drivers/staging/b3dfg/b3dfg.c
@@ -33,6 +33,7 @@
#include <linux/cdev.h>
#include <linux/list.h>
#include <linux/poll.h>
+#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/mm.h>
#include <linux/uaccess.h>
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -30,6 +30,7 @@
#include <linux/ioport.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
+#include <linux/sched.h>
#include <linux/wait.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -19,6 +19,8 @@
#include <linux/interrupt.h>
#include <linux/poll.h>
#include <linux/cdev.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
#include "iio.h"
#include "trigger_consumer.h"

--- a/drivers/staging/poch/poch.c
+++ b/drivers/staging/poch/poch.c
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/ioctl.h>
#include <linux/io.h>
+#include <linux/sched.h>

#include "poch.h"

--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -38,6 +38,7 @@
#include <linux/mm.h>
#include <linux/poll.h>
#include <linux/wait.h>
+#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/firmware.h>
#include <asm/ioctl.h>
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -25,6 +25,7 @@
#include <linux/poll.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
+#include <linux/sched.h>
#include <asm/time.h>
#include <asm/io.h>
#include <asm/uaccess.h>
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -25,6 +25,7 @@
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>
+#include <linux/sched.h>
#include <asm/time.h>
#include <asm/io.h>
#include <asm/uaccess.h>
--
Jeff Mahoney
SUSE Labs


2009-10-13 11:08:28

by Jonathan Cameron

[permalink] [raw]
Subject: Re: [PATCH] staging: Complete sched.h removal from interrupt.h

Hi Jeff,
> drivers/staging/iio/industrialio-core.c | 2 ++
>
...
> --- a/drivers/staging/iio/industrialio-core.c
> +++ b/drivers/staging/iio/industrialio-core.c
> @@ -19,6 +19,8 @@
> #include <linux/interrupt.h>
> #include <linux/poll.h>
> #include <linux/cdev.h>
> +#include <linux/sched.h>
> +#include <linux/wait.h>
> #include "iio.h"
> #include "trigger_consumer.h"
>
Greg has already picked up a patch for this one, but might make more
sense to drop
that and merge all these fixes as one. Original patch only added
sched.h though.
Is wait.h due to a similar issue that is going to bite in the future?
(could chase this
down but as you added it seemed easier to ask!)

Thanks,

Jonathan

2009-10-13 14:24:51

by Jeff Mahoney

[permalink] [raw]
Subject: Re: [PATCH] staging: Complete sched.h removal from interrupt.h

On 10/13/2009 07:08 AM, Jonathan Cameron wrote:
> Hi Jeff,
>> drivers/staging/iio/industrialio-core.c | 2 ++
>>
> ...
>> --- a/drivers/staging/iio/industrialio-core.c
>> +++ b/drivers/staging/iio/industrialio-core.c
>> @@ -19,6 +19,8 @@
>> #include <linux/interrupt.h>
>> #include <linux/poll.h>
>> #include <linux/cdev.h>
>> +#include <linux/sched.h>
>> +#include <linux/wait.h>
>> #include "iio.h"
>> #include "trigger_consumer.h"
>>
> Greg has already picked up a patch for this one, but might make more
> sense to drop
> that and merge all these fixes as one. Original patch only added
> sched.h though.
> Is wait.h due to a similar issue that is going to bite in the future?
> (could chase this
> down but as you added it seemed easier to ask!)

Nope, I think iio was probably the first driver I saw this build failure
in and observed that it was in the wait queue code. It's not necessary,
though it doesn't cost anything either since wait.h is already included
somewhere.

-Jeff

--
Jeff Mahoney
SUSE Labs