Module: xenomai-2.6 Branch: master Commit: 2835f42da0e4dd3805eba97878baa5f92dbf4544 URL: http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=2835f42da0e4dd3805eba97878baa5f92dbf4544
Author: Philippe Gerum <r...@xenomai.org> Date: Tue Jul 3 14:29:14 2012 +0200 hal/powerpc: fix build over legacy 2.4 kernel --- ksrc/arch/powerpc/hal.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ksrc/arch/powerpc/hal.c b/ksrc/arch/powerpc/hal.c index ad1b04a..6f58b3a 100644 --- a/ksrc/arch/powerpc/hal.c +++ b/ksrc/arch/powerpc/hal.c @@ -147,17 +147,6 @@ static inline int rthal_tickdev_select(void) #define RTHAL_SET_ONESHOT_LINUX 2 #define RTHAL_SET_PERIODIC 3 -#ifdef CONFIG_GENERIC_CLOCKEVENTS - -static inline void rthal_disarm_decr(int disarmed) -{ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - disarm_decr[rthal_processor_id()] = disarmed; -#else - per_cpu(disarm_decr, rthal_processor_id()) = disarmed; -#endif -} - static inline void rthal_setup_oneshot_dec(void) { #ifdef CONFIG_40x @@ -175,6 +164,15 @@ static inline void rthal_setup_periodic_dec(void) #endif /* CONFIG_40x */ } +static inline void rthal_disarm_decr(int disarmed) +{ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + disarm_decr[rthal_processor_id()] = disarmed; +#else + per_cpu(disarm_decr, rthal_processor_id()) = disarmed; +#endif +} + #ifdef CONFIG_SMP static void rthal_critical_sync(void) @@ -237,6 +235,13 @@ static void rthal_timer_set_periodic(void) rthal_critical_exit(flags); } +static inline int rthal_tickdev_select(void) +{ + return 0; +} + +#ifdef CONFIG_GENERIC_CLOCKEVENTS + static inline int rthal_tickdev_request(void (*tick_handler)(void), void (*mode_emul)(enum clock_event_mode mode, @@ -320,11 +325,6 @@ static inline void rthal_tickdev_release(int cpu) rthal_timer_set_oneshot(0); } -static inline int rthal_tickdev_select(void) -{ - return 0; -} - #endif /* CONFIG_GENERIC_CLOCKEVENTS */ #endif /* !CONFIG_IPIPE_CORE */ _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://www.xenomai.org/mailman/listinfo/xenomai-git