Module: xenomai-2.6 Branch: master Commit: 5b5dd5f6ee30a37e797b9ddbbe2c5d735fa674ec URL: http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=5b5dd5f6ee30a37e797b9ddbbe2c5d735fa674ec
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Tue Jan 28 22:53:58 2014 +0100 arm/hal: fix compilation with old kernels --- include/asm-arm/wrappers.h | 10 +++++----- ksrc/arch/arm/hal.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/asm-arm/wrappers.h b/include/asm-arm/wrappers.h index 6706ff9..1d4e6a3 100644 --- a/include/asm-arm/wrappers.h +++ b/include/asm-arm/wrappers.h @@ -106,6 +106,11 @@ static inline void fp_init(union fp_state *state) #define vfp_current_hw_state last_VFP_context #endif /* Linux < 3.1 */ +#if defined(CONFIG_SMP) && !defined(CONFIG_XENO_HW_UNLOCKED_SWITCH) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) +#error "Xenomai: ARM SMP systems require unlocked context switch prior to Linux 3.8" +#endif + #if !defined(CONFIG_IPIPE_CORE) && !defined(__IPIPE_FEATURE_UNMASKED_CONTEXT_SWITCH) && defined(TIF_MMSWITCH_INT) /* * Legacy ARM patches might provide unmasked context switch support @@ -115,9 +120,4 @@ static inline void fp_init(union fp_state *state) #define CONFIG_XENO_HW_UNLOCKED_SWITCH 1 #endif -#if defined(CONFIG_SMP) && !defined(CONFIG_XENO_HW_UNLOCKED_SWITCH) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) -#error "Xenomai: ARM SMP systems require unlocked context switch prior to Linux 3.8" -#endif - #endif /* _XENO_ASM_ARM_WRAPPERS_H */ diff --git a/ksrc/arch/arm/hal.c b/ksrc/arch/arm/hal.c index 32dcc66..c7e06a5 100644 --- a/ksrc/arch/arm/hal.c +++ b/ksrc/arch/arm/hal.c @@ -44,7 +44,7 @@ #include <asm/unistd.h> #include <asm/xenomai/hal.h> #include <asm/cacheflush.h> -#include <asm/system_info.h> +#include <asm/system.h> #ifdef CONFIG_PROC_FS #include <linux/proc_fs.h> #endif /* CONFIG_PROC_FS */ _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git
