pxa-camera: build error 2.6.32-rc4

pxa-camera: build error 2.6.32-rc4

[Jonathan Cameron]

Error was 

drivers/media/video/pxa_camera.c: In function 'pxa_camera_wakeup':
drivers/media/video/pxa_camera.c:683: error: 'TASK_NORMAL' undeclared (first use in this function)
drivers/media/video/pxa_camera.c:683: error: (Each undeclared identifier is reported only once
drivers/media/video/pxa_camera.c:683: error: for each function it appears in.)
  CC [M]  drivers/pcmcia/soc_common.o

Line in question is

        wake_up(&vb->done);
in pxa_camera_wakeup.

Looks like issue is lack of inclusion of sched.h.

Right now I'm having trouble tracking down why this became and issue since 2.6.32-rc3.

Might be related to
Staging: comedi: Add include of <linux/sched.h> to fix build
which is down to removal of sched.h from poll.h
commmit a99bbaf5ee6bad1aca0c88ea65ec6e5373e86184
Looks like media/v4l2-dev.h and others include poll.h so I'm guessing
we were original getting it from there.

I'm happy to post a patch but was wondering if anyone else has seen this or has tracked down
exactly what changed, not to mention if this is a more general problem? (or for that matter
already fixed and I just missed it.)

Thanks

Jonathan

Re: pxa-camera: build error 2.6.32-rc4

[Jonathan Cameron]

Jonathan Cameron wrote:
> Error was 
> 
> drivers/media/video/pxa_camera.c: In function 'pxa_camera_wakeup':
> drivers/media/video/pxa_camera.c:683: error: 'TASK_NORMAL' undeclared (first use in this function)
> drivers/media/video/pxa_camera.c:683: error: (Each undeclared identifier is reported only once
> drivers/media/video/pxa_camera.c:683: error: for each function it appears in.)
>   CC [M]  drivers/pcmcia/soc_common.o
> 
> Line in question is
> 
>         wake_up(&vb->done);
> in pxa_camera_wakeup.
> 
> Looks like issue is lack of inclusion of sched.h.
> 
> Right now I'm having trouble tracking down why this became and issue since 2.6.32-rc3.
> 
> Might be related to
> Staging: comedi: Add include of <linux/sched.h> to fix build
> which is down to removal of sched.h from poll.h
> commmit a99bbaf5ee6bad1aca0c88ea65ec6e5373e86184
> Looks like media/v4l2-dev.h and others include poll.h so I'm guessing
> we were original getting it from there.
> 
> I'm happy to post a patch but was wondering if anyone else has seen this or has tracked down
> exactly what changed, not to mention if this is a more general problem? (or for that matter
> already fixed and I just missed it.)

Just read lkml, Ingo Molnar has posted a whole set of patches (in reply to Linus' 2.6.32-rc4 thread)
dealing with this issue in a number of other places.  This one isn't there however.

Jonathan

[PATCH] pxa-camera: Fix missing sched.h

[Jonathan Cameron]

linux/sched.h include was removed form linux/poll.h by
commmit a99bbaf5ee6bad1aca0c88ea65ec6e5373e86184

Required for wakeup call.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
 drivers/media/video/pxa_camera.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 6952e96..5d01dcf 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -26,6 +26,7 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/sched.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-dev.h>
-- 
1.6.3.3

Re: [PATCH] pxa-camera: Fix missing sched.h

[Guennadi Liakhovetski]

On Mon, 12 Oct 2009, Jonathan Cameron wrote:

> linux/sched.h include was removed form linux/poll.h by
> commmit a99bbaf5ee6bad1aca0c88ea65ec6e5373e86184
> 
> Required for wakeup call.
> 
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>

Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Mauro, can you take it from here with my ack for -rc5 or do I have to pull 
it through my tree?

Thanks
Guennadi

> ---
>  drivers/media/video/pxa_camera.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
> index 6952e96..5d01dcf 100644
> --- a/drivers/media/video/pxa_camera.c
> +++ b/drivers/media/video/pxa_camera.c
> @@ -26,6 +26,7 @@
>  #include <linux/device.h>
>  #include <linux/platform_device.h>
>  #include <linux/clk.h>
> +#include <linux/sched.h>
>  
>  #include <media/v4l2-common.h>
>  #include <media/v4l2-dev.h>
> -- 
> 1.6.3.3
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/