Module: xenomai-2.6
Branch: master
Commit: 1781aaf3044843d817b80027abfddf2c559a929c
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=1781aaf3044843d817b80027abfddf2c559a929c
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Sep 3 10:13:38 2012 +0200
wrappers: fix cpu_online_map/mask wrapping
---
include/asm-generic/wrappers.h | 7 +++++--
include/asm-powerpc/bits/intr.h | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h
index 7f95f0f..ea8a479 100644
--- a/include/asm-generic/wrappers.h
+++ b/include/asm-generic/wrappers.h
@@ -701,10 +701,13 @@ static inline void wrap_proc_dir_entry_owner(struct
proc_dir_entry *entry)
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
-#define cpu_online_mask &(cpu_online_map)
-
#include <linux/sched.h>
#include <linux/mm.h>
+#include <linux/smp.h>
+
+#ifndef cpu_online_map
+#define cpu_online_mask (&cpu_online_map)
+#endif
static inline
unsigned long vm_mmap(struct file *file, unsigned long addr,
diff --git a/include/asm-powerpc/bits/intr.h b/include/asm-powerpc/bits/intr.h
index c6053e1..312545a 100644
--- a/include/asm-powerpc/bits/intr.h
+++ b/include/asm-powerpc/bits/intr.h
@@ -28,7 +28,7 @@
static inline void xnarch_relay_tick(void)
{
#if defined(CONFIG_SMP) && !defined(CONFIG_GENERIC_CLOCKEVENTS)
- cpumask_t mask = cpu_online_map;
+ cpumask_t mask = cpu_online_mask;
cpu_clear(rthal_processor_id(), mask);
rthal_send_ipi(RTHAL_HOST_TIMER_IPI, mask);
#endif /* CONFIG_SMP */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
