V4L: Events: Include slab.h explicitly

Message ID 1272380899-30398-1-git-send-email-saaguirre@ti.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Aguirre Rodriguez, Sergio Alberto April 27, 2010, 3:08 p.m. UTC
  After commit ID:

  commit de380b55f92986c1a84198149cb71b7228d15fbd
  Author: Tejun Heo <tj@kernel.org>
  Date:   Wed Mar 24 17:06:43 2010 +0900

      percpu: don't implicitly include slab.h from percpu.h

slab.h include was not longer implicitly included with sched.h.

So, now we have to include slab.h explicitly.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
 drivers/media/video/v4l2-event.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
  

Comments

Aguirre Rodriguez, Sergio Alberto April 27, 2010, 3:08 p.m. UTC | #1
Sakari,

This patch is based on your event branch:

http://gitorious.org/omap3camera/mainline/commits/event

And is required on latest kernel to compile v4l2-event.c, to make use of kmalloc and other slab.h functions/defines.

Regards,
Sergio

> -----Original Message-----
> From: Aguirre, Sergio
> Sent: Tuesday, April 27, 2010 10:08 AM
> To: Sakari Ailus
> Cc: linux-media@vger.kernel.org; Aguirre, Sergio
> Subject: [PATCH] V4L: Events: Include slab.h explicitly
> 
> After commit ID:
> 
>   commit de380b55f92986c1a84198149cb71b7228d15fbd
>   Author: Tejun Heo <tj@kernel.org>
>   Date:   Wed Mar 24 17:06:43 2010 +0900
> 
>       percpu: don't implicitly include slab.h from percpu.h
> 
> slab.h include was not longer implicitly included with sched.h.
> 
> So, now we have to include slab.h explicitly.
> 
> Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
> ---
>  drivers/media/video/v4l2-event.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-
> event.c
> index aea4332..7f31cd2 100644
> --- a/drivers/media/video/v4l2-event.c
> +++ b/drivers/media/video/v4l2-event.c
> @@ -26,6 +26,7 @@
>  #include <media/v4l2-fh.h>
>  #include <media/v4l2-event.h>
> 
> +#include <linux/slab.h>
>  #include <linux/sched.h>
> 
>  int v4l2_event_init(struct v4l2_fh *fh)
> --
> 1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  
Mauro Carvalho Chehab April 27, 2010, 4:09 p.m. UTC | #2
Aguirre, Sergio wrote:
> Sakari,
> 
> This patch is based on your event branch:
> 
> http://gitorious.org/omap3camera/mainline/commits/event
> 
> And is required on latest kernel to compile v4l2-event.c, to make use of kmalloc and other slab.h functions/defines.


True.

Sakari,

Please, add this patch on your series before any Makefile entries that would try to compile
the events interface (or just fold it to the patch that added v4l2-event.c).

Cheers,
Mauro.

> Regards,
> Sergio
> 
>> -----Original Message-----
>> From: Aguirre, Sergio
>> Sent: Tuesday, April 27, 2010 10:08 AM
>> To: Sakari Ailus
>> Cc: linux-media@vger.kernel.org; Aguirre, Sergio
>> Subject: [PATCH] V4L: Events: Include slab.h explicitly
>>
>> After commit ID:
>>
>>   commit de380b55f92986c1a84198149cb71b7228d15fbd
>>   Author: Tejun Heo <tj@kernel.org>
>>   Date:   Wed Mar 24 17:06:43 2010 +0900
>>
>>       percpu: don't implicitly include slab.h from percpu.h
>>
>> slab.h include was not longer implicitly included with sched.h.
>>
>> So, now we have to include slab.h explicitly.
>>
>> Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
>> ---
>>  drivers/media/video/v4l2-event.c |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-
>> event.c
>> index aea4332..7f31cd2 100644
>> --- a/drivers/media/video/v4l2-event.c
>> +++ b/drivers/media/video/v4l2-event.c
>> @@ -26,6 +26,7 @@
>>  #include <media/v4l2-fh.h>
>>  #include <media/v4l2-event.h>
>>
>> +#include <linux/slab.h>
>>  #include <linux/sched.h>
>>
>>  int v4l2_event_init(struct v4l2_fh *fh)
>> --
>> 1.6.3.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
  
Sakari Ailus April 27, 2010, 4:16 p.m. UTC | #3
Mauro Carvalho Chehab wrote:
> Aguirre, Sergio wrote:
>> Sakari,
>>
>> This patch is based on your event branch:
>>
>> http://gitorious.org/omap3camera/mainline/commits/event
>>
>> And is required on latest kernel to compile v4l2-event.c, to make use of kmalloc and other slab.h functions/defines.
> 
> 
> True.
> 
> Sakari,
> 
> Please, add this patch on your series before any Makefile entries that would try to compile
> the events interface (or just fold it to the patch that added v4l2-event.c).

Unfortunately the Makefile changes are in the same patch than the
missing linux/slab.h.
  
Mauro Carvalho Chehab April 27, 2010, 4:30 p.m. UTC | #4
Sakari Ailus wrote:
> Mauro Carvalho Chehab wrote:
>> Aguirre, Sergio wrote:
>>> Sakari,
>>>
>>> This patch is based on your event branch:
>>>
>>> http://gitorious.org/omap3camera/mainline/commits/event
>>>
>>> And is required on latest kernel to compile v4l2-event.c, to make use of kmalloc and other slab.h functions/defines.
>>
>> True.
>>
>> Sakari,
>>
>> Please, add this patch on your series before any Makefile entries that would try to compile
>> the events interface (or just fold it to the patch that added v4l2-event.c).
> 
> Unfortunately the Makefile changes are in the same patch than the
> missing linux/slab.h.
> 
So, you'll need to fold his patch, or breaking the Makefile changes into another, otherwise, you'll
break git bisect.
  
Sakari Ailus April 27, 2010, 8:23 p.m. UTC | #5
Hi Mauro,

Mauro Carvalho Chehab wrote:
> Sakari Ailus wrote:
>> Mauro Carvalho Chehab wrote:
>>> Aguirre, Sergio wrote:
>>>> Sakari,
>>>>
>>>> This patch is based on your event branch:
>>>>
>>>> http://gitorious.org/omap3camera/mainline/commits/event
>>>>
>>>> And is required on latest kernel to compile v4l2-event.c, to make use of kmalloc and other slab.h functions/defines.
>>>
>>> True.
>>>
>>> Sakari,
>>>
>>> Please, add this patch on your series before any Makefile entries that would try to compile
>>> the events interface (or just fold it to the patch that added v4l2-event.c).
>>
>> Unfortunately the Makefile changes are in the same patch than the
>> missing linux/slab.h.
>>
> So, you'll need to fold his patch, or breaking the Makefile changes into another, otherwise, you'll
> break git bisect.

Did you receive my new pull request? It has this change included in the
fourth patch.

Regards,
  
Sakari Ailus April 28, 2010, 2:27 p.m. UTC | #6
Sergio Aguirre wrote:
> After commit ID:
> 
>   commit de380b55f92986c1a84198149cb71b7228d15fbd
>   Author: Tejun Heo <tj@kernel.org>
>   Date:   Wed Mar 24 17:06:43 2010 +0900
> 
>       percpu: don't implicitly include slab.h from percpu.h
> 
> slab.h include was not longer implicitly included with sched.h.
> 
> So, now we have to include slab.h explicitly.
> 
> Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
> ---
>  drivers/media/video/v4l2-event.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c
> index aea4332..7f31cd2 100644
> --- a/drivers/media/video/v4l2-event.c
> +++ b/drivers/media/video/v4l2-event.c
> @@ -26,6 +26,7 @@
>  #include <media/v4l2-fh.h>
>  #include <media/v4l2-event.h>
>  
> +#include <linux/slab.h>
>  #include <linux/sched.h>
>  
>  int v4l2_event_init(struct v4l2_fh *fh)

Thanks for the patch, Sergio!

I was going to say that I'll send a new pull request but apparently
forgot to send this one in time. Anyway, this is now included in the
patchset, merged with another patch.

Regards,
  

Patch

diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c
index aea4332..7f31cd2 100644
--- a/drivers/media/video/v4l2-event.c
+++ b/drivers/media/video/v4l2-event.c
@@ -26,6 +26,7 @@ 
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
 
+#include <linux/slab.h>
 #include <linux/sched.h>
 
 int v4l2_event_init(struct v4l2_fh *fh)