Module: xenomai-forge
Branch: master
Commit: 086fff9aa263225c203fcf49912fa10ba2e02260
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=086fff9aa263225c203fcf49912fa10ba2e02260

Author: Philippe Gerum <r...@xenomai.org>
Date:   Tue Aug 14 15:26:57 2012 +0200

cobalt/powerpc: fix up for kernel 3.4 series

---

 include/asm-powerpc/fptest.h     |    1 -
 include/asm-powerpc/hal.h        |    1 -
 kernel/cobalt/arch/powerpc/hal.c |   15 +++++++--------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/asm-powerpc/fptest.h b/include/asm-powerpc/fptest.h
index c8381d6..46b97e0 100644
--- a/include/asm-powerpc/fptest.h
+++ b/include/asm-powerpc/fptest.h
@@ -3,7 +3,6 @@
 
 #ifdef __KERNEL__
 #include <linux/module.h>
-#include <asm/system.h>
 
 static inline int fp_kernel_supported(void)
 {
diff --git a/include/asm-powerpc/hal.h b/include/asm-powerpc/hal.h
index 721f455..19bfcc4 100644
--- a/include/asm-powerpc/hal.h
+++ b/include/asm-powerpc/hal.h
@@ -54,7 +54,6 @@ static inline __attribute_const__ unsigned long ffnz(unsigned 
long ul)
 
 #ifndef __cplusplus
 #include <linux/irq.h>
-#include <asm/system.h>
 #include <asm/time.h>
 #include <asm/timex.h>
 #include <asm/xenomai/atomic.h>
diff --git a/kernel/cobalt/arch/powerpc/hal.c b/kernel/cobalt/arch/powerpc/hal.c
index 9aea41d..b38d541 100644
--- a/kernel/cobalt/arch/powerpc/hal.c
+++ b/kernel/cobalt/arch/powerpc/hal.c
@@ -34,7 +34,6 @@
 #include <linux/irq.h>
 #include <linux/console.h>
 #include <linux/ipipe_tickdev.h>
-#include <asm/system.h>
 #include <asm/hardirq.h>
 #include <asm/hw_irq.h>
 #include <asm/irq.h>
@@ -152,16 +151,16 @@ int rthal_timer_request(void (*tick_handler)(void),
                                         struct clock_event_device *cdev),
                        int cpu)
 {
-       unsigned long dummy, *tmfreq = &dummy;
-       int tickval, ret, res;
+       int tickval, ret;
 
 #ifndef CONFIG_IPIPE_CORE
-       res = ipipe_request_tickdev("decrementer", mode_emul, tick_emul, cpu,
+       unsigned long dummy, *tmfreq = &dummy;
+       ret = ipipe_request_tickdev("decrementer", mode_emul, tick_emul, cpu,
                                    tmfreq);
 #else /* CONFIG_IPIPE_CORE */
-       res = ipipe_timer_start(tick_handler, mode_emul, tick_emul, cpu);
+       ret = ipipe_timer_start(tick_handler, mode_emul, tick_emul, cpu);
 #endif /* CONFIG_IPIPE_CORE */
-       switch (res) {
+       switch (ret) {
        case CLOCK_EVT_MODE_PERIODIC:
                /* oneshot tick emulation callback won't be used, ask
                 * the caller to start an internal timer for emulating
@@ -183,9 +182,9 @@ int rthal_timer_request(void (*tick_handler)(void),
                return -ENODEV;
 
        default:
-               return res;
+               return ret;
        }
-       rthal_ktimer_saved_mode = res;
+       rthal_ktimer_saved_mode = ret;
 
        /*
         * The rest of the initialization should only be performed


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to