Patchwork arm: arch_timer: include linux/errno.h to declare ENXIO

login
register
mail settings
Submitter Stephen Warren
Date Feb. 13, 2013, 6:05 p.m.
Message ID <1360778746-27809-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/220220/
State New
Headers show

Comments

Stephen Warren - Feb. 13, 2013, 6:05 p.m.
From: Stephen Warren <swarren@nvidia.com>

This fixes:
arch/arm/kernel/arch_timer.c: In function ‘arch_timer_sched_clock_init’:
arch/arm/kernel/arch_timer.c:55:11: error: ‘ENXIO’ undeclared (first use in this function)

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
tegra_defconfig builds OK, but with my local change to convert Tegra to
multi-platform, I need this fix to compile. This issue is new sometime
after next-20130211.

 arch/arm/kernel/arch_timer.c |    1 +
 1 file changed, 1 insertion(+)
Mark Rutland - Feb. 14, 2013, 12:18 p.m.
On Wed, Feb 13, 2013 at 06:05:46PM +0000, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> This fixes:
> arch/arm/kernel/arch_timer.c: In function ‘arch_timer_sched_clock_init’:
> arch/arm/kernel/arch_timer.c:55:11: error: ‘ENXIO’ undeclared (first use in this function)
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> tegra_defconfig builds OK, but with my local change to convert Tegra to
> multi-platform, I need this fix to compile. This issue is new sometime
> after next-20130211.
> 
>  arch/arm/kernel/arch_timer.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
> index 36ebcf4..8fba00f 100644
> --- a/arch/arm/kernel/arch_timer.c
> +++ b/arch/arm/kernel/arch_timer.c
> @@ -8,6 +8,7 @@
>   * it under the terms of the GNU General Public License version 2 as
>   * published by the Free Software Foundation.
>   */
> +#include <linux/errno.h>
>  #include <linux/init.h>
>  #include <linux/types.h>
>  
> -- 
> 1.7.10.4
> 

We should probably also add this to include/clocksource/arm_arch_timer.h and
drivers/clocksource/arm_arch_timer.c, as they both use errno values (though
currently these get included indirectly via a different path).

Thanks,
Mark.
Stephen Warren - Feb. 14, 2013, 5:39 p.m.
On 02/14/2013 05:18 AM, Mark Rutland wrote:
> On Wed, Feb 13, 2013 at 06:05:46PM +0000, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> This fixes:
>> arch/arm/kernel/arch_timer.c: In function ‘arch_timer_sched_clock_init’:
>> arch/arm/kernel/arch_timer.c:55:11: error: ‘ENXIO’ undeclared (first use in this function)
..
> We should probably also add this to include/clocksource/arm_arch_timer.h and
> drivers/clocksource/arm_arch_timer.c, as they both use errno values (though
> currently these get included indirectly via a different path).

Ah yes, it should certainly be added to the header file then. Since both
those .c files include that header, I guess there isn't much need to add
it separately to the .c files though?

Do you want me to respin the patch, or will you just create one to add
the include to the header?
Mark Rutland - Feb. 15, 2013, 10:18 a.m.
On Thu, Feb 14, 2013 at 05:39:40PM +0000, Stephen Warren wrote:
> On 02/14/2013 05:18 AM, Mark Rutland wrote:
> > On Wed, Feb 13, 2013 at 06:05:46PM +0000, Stephen Warren wrote:
> >> From: Stephen Warren <swarren@nvidia.com>
> >>
> >> This fixes:
> >> arch/arm/kernel/arch_timer.c: In function ‘arch_timer_sched_clock_init’:
> >> arch/arm/kernel/arch_timer.c:55:11: error: ‘ENXIO’ undeclared (first use in this function)
> ..
> > We should probably also add this to include/clocksource/arm_arch_timer.h and
> > drivers/clocksource/arm_arch_timer.c, as they both use errno values (though
> > currently these get included indirectly via a different path).
> 
> Ah yes, it should certainly be added to the header file then. Since both
> those .c files include that header, I guess there isn't much need to add
> it separately to the .c files though?
> 
> Do you want me to respin the patch, or will you just create one to add
> the include to the header?
> 

I think it makes sense to have the include in both the header and the .c file,
as they both use error codes explicitly. The header (and
drivers/clocksource/arm_arch_timer.c) seem to build for the moment, so they can
be fixed up later.

Arnd seems to have arrived at the same patch in his allyesconfig fix series:
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-February/149856.html

I'm happy to see either version go in.

Thanks,
Mark.

Patch

diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index 36ebcf4..8fba00f 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -8,6 +8,7 @@ 
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/types.h>