diff mbox

arm: include linux/sched.h in syscall.h

Message ID 5069F8A0.5020801@mentor.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wade Farnsworth Oct. 1, 2012, 8:10 p.m. UTC
task_thread_info() is defined in linux/sched.h.  Explicitly include this
file in arch/arm/include/asm/syscall.h.  This fixes an lttng-modules compile error.

Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
---
 arch/arm/include/asm/syscall.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Will Deacon Oct. 2, 2012, 12:21 p.m. UTC | #1
Hi Wade,

On Mon, Oct 01, 2012 at 09:10:08PM +0100, Wade Farnsworth wrote:
> task_thread_info() is defined in linux/sched.h.  Explicitly include this
> file in arch/arm/include/asm/syscall.h.  This fixes an lttng-modules compile error.

Can you be more specific about the error? From your description, it sounds
like it should be fixed in lttng rather than here.

Cheers,

Will

> Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
> ---
>  arch/arm/include/asm/syscall.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
> index c334a23..fce38a6 100644
> --- a/arch/arm/include/asm/syscall.h
> +++ b/arch/arm/include/asm/syscall.h
> @@ -8,6 +8,7 @@
>  #define _ASM_ARM_SYSCALL_H
>  
>  #include <linux/err.h>
> +#include <linux/sched.h>
>  
>  extern const unsigned long sys_call_table[];
>  
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Wade Farnsworth Oct. 2, 2012, 3:43 p.m. UTC | #2
Hi Will,

Will Deacon wrote:
> Hi Wade,
>
> On Mon, Oct 01, 2012 at 09:10:08PM +0100, Wade Farnsworth wrote:
>> task_thread_info() is defined in linux/sched.h.  Explicitly include this
>> file in arch/arm/include/asm/syscall.h.  This fixes an lttng-modules compile error.
>
> Can you be more specific about the error? From your description, it sounds
> like it should be fixed in lttng rather than here.
>
> Cheers,
>
> Will

My apologies for the lack of clarity.

My syscall tracing patch introduces a compile bug in lttng-modules when 
the latter calls syscall_get_nr(), similar to the following:

<path-to-linux>/arch/arm/include/asm/syscall.h:21:2: error: implicit 
declaration of function 'task_thread_info' 
[-Werror=implicit-function-declaration]

The issue is that we are using task_thread_info() in the 
syscall_get_nr() function in asm/syscall.h, but not explicitly including 
sched.h from this file, so we can expect this bug might surface any time 
that syscall_get_nr() is called.

Hopefully that clarifies things somewhat.

Thanks,

Wade

>
>> Signed-off-by: Wade Farnsworth<wade_farnsworth@mentor.com>
>> ---
>>   arch/arm/include/asm/syscall.h |    1 +
>>   1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
>> index c334a23..fce38a6 100644
>> --- a/arch/arm/include/asm/syscall.h
>> +++ b/arch/arm/include/asm/syscall.h
>> @@ -8,6 +8,7 @@
>>   #define _ASM_ARM_SYSCALL_H
>>
>>   #include<linux/err.h>
>> +#include<linux/sched.h>
>>
>>   extern const unsigned long sys_call_table[];
>>
>> --
>> 1.7.0.4
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
Will Deacon Oct. 2, 2012, 3:52 p.m. UTC | #3
On Tue, Oct 02, 2012 at 04:43:44PM +0100, Wade Farnsworth wrote:
> > On Mon, Oct 01, 2012 at 09:10:08PM +0100, Wade Farnsworth wrote:
> >> task_thread_info() is defined in linux/sched.h.  Explicitly include this
> >> file in arch/arm/include/asm/syscall.h.  This fixes an lttng-modules compile error.
> >
> > Can you be more specific about the error? From your description, it sounds
> > like it should be fixed in lttng rather than here.
> >
> My apologies for the lack of clarity.
> 
> My syscall tracing patch introduces a compile bug in lttng-modules when 
> the latter calls syscall_get_nr(), similar to the following:
> 
> <path-to-linux>/arch/arm/include/asm/syscall.h:21:2: error: implicit 
> declaration of function 'task_thread_info' 
> [-Werror=implicit-function-declaration]
> 
> The issue is that we are using task_thread_info() in the 
> syscall_get_nr() function in asm/syscall.h, but not explicitly including 
> sched.h from this file, so we can expect this bug might surface any time 
> that syscall_get_nr() is called.
> 
> Hopefully that clarifies things somewhat.

Yep, thanks. Your patch sounds like the right thing to do, but please
include the compiler error in your commit log.

Acked-by: Will Deacon <will.deacon@arm.com>

Will
Russell King - ARM Linux Oct. 4, 2012, 11:09 p.m. UTC | #4
On Tue, Oct 02, 2012 at 04:52:55PM +0100, Will Deacon wrote:
> On Tue, Oct 02, 2012 at 04:43:44PM +0100, Wade Farnsworth wrote:
> > > On Mon, Oct 01, 2012 at 09:10:08PM +0100, Wade Farnsworth wrote:
> > >> task_thread_info() is defined in linux/sched.h.  Explicitly include this
> > >> file in arch/arm/include/asm/syscall.h.  This fixes an lttng-modules compile error.
> > >
> > > Can you be more specific about the error? From your description, it sounds
> > > like it should be fixed in lttng rather than here.
> > >
> > My apologies for the lack of clarity.
> > 
> > My syscall tracing patch introduces a compile bug in lttng-modules when 
> > the latter calls syscall_get_nr(), similar to the following:
> > 
> > <path-to-linux>/arch/arm/include/asm/syscall.h:21:2: error: implicit 
> > declaration of function 'task_thread_info' 
> > [-Werror=implicit-function-declaration]
> > 
> > The issue is that we are using task_thread_info() in the 
> > syscall_get_nr() function in asm/syscall.h, but not explicitly including 
> > sched.h from this file, so we can expect this bug might surface any time 
> > that syscall_get_nr() is called.
> > 
> > Hopefully that clarifies things somewhat.
> 
> Yep, thanks. Your patch sounds like the right thing to do, but please
> include the compiler error in your commit log.
> 
> Acked-by: Will Deacon <will.deacon@arm.com>

From what I can tell, the original commit went in during the 3.4..3.5
timeframe, so doesn't this patch need to be applied to v3.5-stable
as well as 3.6-stable and for 3.7 ?
Will Deacon Oct. 5, 2012, 9:16 a.m. UTC | #5
On Fri, Oct 05, 2012 at 12:09:57AM +0100, Russell King - ARM Linux wrote:
> On Tue, Oct 02, 2012 at 04:52:55PM +0100, Will Deacon wrote:
> > 
> > Yep, thanks. Your patch sounds like the right thing to do, but please
> > include the compiler error in your commit log.
> > 
> > Acked-by: Will Deacon <will.deacon@arm.com>
> 
> From what I can tell, the original commit went in during the 3.4..3.5
> timeframe, so doesn't this patch need to be applied to v3.5-stable
> as well as 3.6-stable and for 3.7 ?

I guess so, although it only seems to be affecting lttng which is still
out-of-tree. Depends how kind you're feeling!

Will
Russell King - ARM Linux Oct. 5, 2012, 9:39 a.m. UTC | #6
On Fri, Oct 05, 2012 at 10:16:24AM +0100, Will Deacon wrote:
> On Fri, Oct 05, 2012 at 12:09:57AM +0100, Russell King - ARM Linux wrote:
> > On Tue, Oct 02, 2012 at 04:52:55PM +0100, Will Deacon wrote:
> > > 
> > > Yep, thanks. Your patch sounds like the right thing to do, but please
> > > include the compiler error in your commit log.
> > > 
> > > Acked-by: Will Deacon <will.deacon@arm.com>
> > 
> > From what I can tell, the original commit went in during the 3.4..3.5
> > timeframe, so doesn't this patch need to be applied to v3.5-stable
> > as well as 3.6-stable and for 3.7 ?
> 
> I guess so, although it only seems to be affecting lttng which is still
> out-of-tree. Depends how kind you're feeling!

Well, it's simple enough.  I'll add the Cc, and I'll also fix the commit
log so that the compiler error message isn't wrapped.
diff mbox

Patch

diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h
index c334a23..fce38a6 100644
--- a/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@ -8,6 +8,7 @@ 
 #define _ASM_ARM_SYSCALL_H
 
 #include <linux/err.h>
+#include <linux/sched.h>
 
 extern const unsigned long sys_call_table[];