[Xenomai-git] Philippe Gerum : cobalt/kernel: drop atomic_set/clear_mask

2013-07-08 Thread git repository hosting 
Module: xenomai-forge
Branch: master
Commit: 97f960b96d5bfec0800f859c3fe0664903832534
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=97f960b96d5bfec0800f859c3fe0664903832534

Author: Philippe Gerum r...@xenomai.org
Date:   Sat Jun 29 16:11:20 2013 +0200

cobalt/kernel: drop atomic_set/clear_mask

Now that setbit() and clrbits() have become useless, we have no more
users of the underlying atomic bitwise operations. Drop them all.

---

 include/cobalt/asm-arm/atomic.h   |   40 ---
 include/cobalt/asm-blackfin/atomic.h  |   12 
 include/cobalt/asm-blackfin/machine.h |6 
 include/cobalt/asm-generic/atomic.h   |   23 +---
 include/cobalt/asm-generic/seqlock.h  |9 +-
 include/cobalt/asm-nios2/atomic.h |   15 --
 include/cobalt/asm-powerpc/atomic.h   |   40 ---
 include/cobalt/asm-sh/atomic.h|   49 -
 include/cobalt/asm-x86/atomic.h   |   39 --
 include/cobalt/asm-x86/fptest.h   |1 +
 include/cobalt/kernel/heap.h  |1 +
 include/cobalt/kernel/types.h |3 --
 kernel/cobalt/arch/blackfin/Makefile  |4 ---
 kernel/cobalt/arch/blackfin/atomic.S  |   43 -
 kernel/cobalt/arch/blackfin/machine.c |3 --
 15 files changed, 10 insertions(+), 278 deletions(-)

diff --git a/include/cobalt/asm-arm/atomic.h b/include/cobalt/asm-arm/atomic.h
index f38186f..a90f89c 100644
--- a/include/cobalt/asm-arm/atomic.h
+++ b/include/cobalt/asm-arm/atomic.h
@@ -23,46 +23,6 @@
 #ifndef _COBALT_ASM_ARM_ATOMIC_H
 #define _COBALT_ASM_ARM_ATOMIC_H
 
-#ifdef __KERNEL__
-#include linux/version.h
-#include asm/irqflags.h
-
-#if __LINUX_ARM_ARCH__ = 6
-static inline void atomic_set_mask(unsigned long mask, unsigned long *addr)
-{
-unsigned long tmp, tmp2;
-
-__asm__ __volatile__(@ atomic_set_mask\n
-1:ldrex   %0, [%3]\n\t
-  orr %0, %0, %4\n\t
-  strex   %1, %0, [%3]\n
-  teq %1, #0\n
-  bne 1b
-: =r (tmp), =r (tmp2), +Qo (*addr)
-: r (addr), Ir (mask)
-: cc);
-}
-#else /* arm = armv5 */
-#define atomic_set_mask(mask, addr)\
-   ({  \
-   unsigned long flags;\
-   \
-   flags = hard_local_irq_save();  \
-   *(unsigned long *)(addr) |= (unsigned long)(mask);  \
-   hard_local_irq_restore(flags);  \
-   })
-#endif /* arm = armv5 */
-
-#else /* !__KERNEL__ */
-#include asm/xenomai/features.h
-
-#if __LINUX_ARM_ARCH__ = 5 || !defined(CONFIG_SMP)
-#define xnarch_memory_barrier() \
-   __asm__ __volatile__ (: /* */ : /* */ :memory)
-#endif /* arm = armv5 || !CONFIG_SMP */
-
-#endif /* !__KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_ARM_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/atomic.h 
b/include/cobalt/asm-blackfin/atomic.h
index 9622f31..9b6e321 100644
--- a/include/cobalt/asm-blackfin/atomic.h
+++ b/include/cobalt/asm-blackfin/atomic.h
@@ -20,18 +20,6 @@
 #ifndef _COBALT_ASM_BLACKFIN_ATOMIC_H
 #define _COBALT_ASM_BLACKFIN_ATOMIC_H
 
-#ifdef __KERNEL__
-
-#include asm/xenomai/machine.h
-
-#define xnarch_atomic_set_mask(pflags, mask)   \
-   __asm_atomic_set_mask((pflags), (mask))
-
-#define xnarch_atomic_clear_mask(pflags, mask) \
-   __asm_atomic_clear_mask((pflags), (mask))
-
-#endif /* __KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/machine.h 
b/include/cobalt/asm-blackfin/machine.h
index af98ad0..b64b262 100644
--- a/include/cobalt/asm-blackfin/machine.h
+++ b/include/cobalt/asm-blackfin/machine.h
@@ -32,12 +32,6 @@ static inline __attribute_const__ unsigned long 
ffnz(unsigned long ul)
return ffs(ul) - 1;
 }
 
-asmlinkage void __asm_atomic_set_mask(unsigned long *addr,
- unsigned long mask);
-
-asmlinkage void __asm_atomic_clear_mask(unsigned long *addr,
-   unsigned long mask);
-
 #include asm-generic/xenomai/machine.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_MACHINE_H */
diff --git a/include/cobalt/asm-generic/atomic.h 
b/include/cobalt/asm-generic/atomic.h
index 7b44887..a9a7b85 100644
--- a/include/cobalt/asm-generic/atomic.h
+++ b/include/cobalt/asm-generic/atomic.h
@@ -21,28 +21,7 @@
 #ifndef _COBALT_ASM_GENERIC_ATOMIC_H
 #define _COBALT_ASM_GENERIC_ATOMIC_H
 
-#include asm/xenomai/features.h
-
-typedef unsigned long

[Xenomai-git] Philippe Gerum : cobalt/kernel: drop atomic_set/clear_mask

2013-06-29 Thread git repository hosting 
Module: xenomai-forge
Branch: next
Commit: 956b66f330d3570c4f7788cb0e95d40493806394
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=956b66f330d3570c4f7788cb0e95d40493806394

Author: Philippe Gerum r...@xenomai.org
Date:   Sat Jun 29 16:11:20 2013 +0200

cobalt/kernel: drop atomic_set/clear_mask

Now that setbit() and clrbits() have become useless, we have no more
users of the underlying atomic bitwise operations. Drop them all.

---

 include/cobalt/asm-arm/atomic.h   |   40 ---
 include/cobalt/asm-blackfin/atomic.h  |   12 
 include/cobalt/asm-blackfin/machine.h |6 
 include/cobalt/asm-generic/atomic.h   |   23 +---
 include/cobalt/asm-generic/seqlock.h  |9 +-
 include/cobalt/asm-nios2/atomic.h |   15 --
 include/cobalt/asm-powerpc/atomic.h   |   40 ---
 include/cobalt/asm-sh/atomic.h|   49 -
 include/cobalt/asm-x86/atomic.h   |   39 --
 include/cobalt/asm-x86/fptest.h   |1 +
 include/cobalt/kernel/heap.h  |1 +
 include/cobalt/kernel/types.h |3 --
 kernel/cobalt/arch/blackfin/Makefile  |4 ---
 kernel/cobalt/arch/blackfin/atomic.S  |   43 -
 kernel/cobalt/arch/blackfin/machine.c |3 --
 15 files changed, 10 insertions(+), 278 deletions(-)

diff --git a/include/cobalt/asm-arm/atomic.h b/include/cobalt/asm-arm/atomic.h
index f38186f..a90f89c 100644
--- a/include/cobalt/asm-arm/atomic.h
+++ b/include/cobalt/asm-arm/atomic.h
@@ -23,46 +23,6 @@
 #ifndef _COBALT_ASM_ARM_ATOMIC_H
 #define _COBALT_ASM_ARM_ATOMIC_H
 
-#ifdef __KERNEL__
-#include linux/version.h
-#include asm/irqflags.h
-
-#if __LINUX_ARM_ARCH__ = 6
-static inline void atomic_set_mask(unsigned long mask, unsigned long *addr)
-{
-unsigned long tmp, tmp2;
-
-__asm__ __volatile__(@ atomic_set_mask\n
-1:ldrex   %0, [%3]\n\t
-  orr %0, %0, %4\n\t
-  strex   %1, %0, [%3]\n
-  teq %1, #0\n
-  bne 1b
-: =r (tmp), =r (tmp2), +Qo (*addr)
-: r (addr), Ir (mask)
-: cc);
-}
-#else /* arm = armv5 */
-#define atomic_set_mask(mask, addr)\
-   ({  \
-   unsigned long flags;\
-   \
-   flags = hard_local_irq_save();  \
-   *(unsigned long *)(addr) |= (unsigned long)(mask);  \
-   hard_local_irq_restore(flags);  \
-   })
-#endif /* arm = armv5 */
-
-#else /* !__KERNEL__ */
-#include asm/xenomai/features.h
-
-#if __LINUX_ARM_ARCH__ = 5 || !defined(CONFIG_SMP)
-#define xnarch_memory_barrier() \
-   __asm__ __volatile__ (: /* */ : /* */ :memory)
-#endif /* arm = armv5 || !CONFIG_SMP */
-
-#endif /* !__KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_ARM_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/atomic.h 
b/include/cobalt/asm-blackfin/atomic.h
index 9622f31..9b6e321 100644
--- a/include/cobalt/asm-blackfin/atomic.h
+++ b/include/cobalt/asm-blackfin/atomic.h
@@ -20,18 +20,6 @@
 #ifndef _COBALT_ASM_BLACKFIN_ATOMIC_H
 #define _COBALT_ASM_BLACKFIN_ATOMIC_H
 
-#ifdef __KERNEL__
-
-#include asm/xenomai/machine.h
-
-#define xnarch_atomic_set_mask(pflags, mask)   \
-   __asm_atomic_set_mask((pflags), (mask))
-
-#define xnarch_atomic_clear_mask(pflags, mask) \
-   __asm_atomic_clear_mask((pflags), (mask))
-
-#endif /* __KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/machine.h 
b/include/cobalt/asm-blackfin/machine.h
index af98ad0..b64b262 100644
--- a/include/cobalt/asm-blackfin/machine.h
+++ b/include/cobalt/asm-blackfin/machine.h
@@ -32,12 +32,6 @@ static inline __attribute_const__ unsigned long 
ffnz(unsigned long ul)
return ffs(ul) - 1;
 }
 
-asmlinkage void __asm_atomic_set_mask(unsigned long *addr,
- unsigned long mask);
-
-asmlinkage void __asm_atomic_clear_mask(unsigned long *addr,
-   unsigned long mask);
-
 #include asm-generic/xenomai/machine.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_MACHINE_H */
diff --git a/include/cobalt/asm-generic/atomic.h 
b/include/cobalt/asm-generic/atomic.h
index 7b44887..a9a7b85 100644
--- a/include/cobalt/asm-generic/atomic.h
+++ b/include/cobalt/asm-generic/atomic.h
@@ -21,28 +21,7 @@
 #ifndef _COBALT_ASM_GENERIC_ATOMIC_H
 #define _COBALT_ASM_GENERIC_ATOMIC_H
 
-#include asm/xenomai/features.h
-
-typedef unsigned long

[Xenomai-git] Philippe Gerum : cobalt/kernel: drop atomic_set/clear_mask

2013-06-29 Thread git repository hosting 
Module: xenomai-forge
Branch: next
Commit: 97f960b96d5bfec0800f859c3fe0664903832534
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=97f960b96d5bfec0800f859c3fe0664903832534

Author: Philippe Gerum r...@xenomai.org
Date:   Sat Jun 29 16:11:20 2013 +0200

cobalt/kernel: drop atomic_set/clear_mask

Now that setbit() and clrbits() have become useless, we have no more
users of the underlying atomic bitwise operations. Drop them all.

---

 include/cobalt/asm-arm/atomic.h   |   40 ---
 include/cobalt/asm-blackfin/atomic.h  |   12 
 include/cobalt/asm-blackfin/machine.h |6 
 include/cobalt/asm-generic/atomic.h   |   23 +---
 include/cobalt/asm-generic/seqlock.h  |9 +-
 include/cobalt/asm-nios2/atomic.h |   15 --
 include/cobalt/asm-powerpc/atomic.h   |   40 ---
 include/cobalt/asm-sh/atomic.h|   49 -
 include/cobalt/asm-x86/atomic.h   |   39 --
 include/cobalt/asm-x86/fptest.h   |1 +
 include/cobalt/kernel/heap.h  |1 +
 include/cobalt/kernel/types.h |3 --
 kernel/cobalt/arch/blackfin/Makefile  |4 ---
 kernel/cobalt/arch/blackfin/atomic.S  |   43 -
 kernel/cobalt/arch/blackfin/machine.c |3 --
 15 files changed, 10 insertions(+), 278 deletions(-)

diff --git a/include/cobalt/asm-arm/atomic.h b/include/cobalt/asm-arm/atomic.h
index f38186f..a90f89c 100644
--- a/include/cobalt/asm-arm/atomic.h
+++ b/include/cobalt/asm-arm/atomic.h
@@ -23,46 +23,6 @@
 #ifndef _COBALT_ASM_ARM_ATOMIC_H
 #define _COBALT_ASM_ARM_ATOMIC_H
 
-#ifdef __KERNEL__
-#include linux/version.h
-#include asm/irqflags.h
-
-#if __LINUX_ARM_ARCH__ = 6
-static inline void atomic_set_mask(unsigned long mask, unsigned long *addr)
-{
-unsigned long tmp, tmp2;
-
-__asm__ __volatile__(@ atomic_set_mask\n
-1:ldrex   %0, [%3]\n\t
-  orr %0, %0, %4\n\t
-  strex   %1, %0, [%3]\n
-  teq %1, #0\n
-  bne 1b
-: =r (tmp), =r (tmp2), +Qo (*addr)
-: r (addr), Ir (mask)
-: cc);
-}
-#else /* arm = armv5 */
-#define atomic_set_mask(mask, addr)\
-   ({  \
-   unsigned long flags;\
-   \
-   flags = hard_local_irq_save();  \
-   *(unsigned long *)(addr) |= (unsigned long)(mask);  \
-   hard_local_irq_restore(flags);  \
-   })
-#endif /* arm = armv5 */
-
-#else /* !__KERNEL__ */
-#include asm/xenomai/features.h
-
-#if __LINUX_ARM_ARCH__ = 5 || !defined(CONFIG_SMP)
-#define xnarch_memory_barrier() \
-   __asm__ __volatile__ (: /* */ : /* */ :memory)
-#endif /* arm = armv5 || !CONFIG_SMP */
-
-#endif /* !__KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_ARM_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/atomic.h 
b/include/cobalt/asm-blackfin/atomic.h
index 9622f31..9b6e321 100644
--- a/include/cobalt/asm-blackfin/atomic.h
+++ b/include/cobalt/asm-blackfin/atomic.h
@@ -20,18 +20,6 @@
 #ifndef _COBALT_ASM_BLACKFIN_ATOMIC_H
 #define _COBALT_ASM_BLACKFIN_ATOMIC_H
 
-#ifdef __KERNEL__
-
-#include asm/xenomai/machine.h
-
-#define xnarch_atomic_set_mask(pflags, mask)   \
-   __asm_atomic_set_mask((pflags), (mask))
-
-#define xnarch_atomic_clear_mask(pflags, mask) \
-   __asm_atomic_clear_mask((pflags), (mask))
-
-#endif /* __KERNEL__ */
-
 #include asm-generic/xenomai/atomic.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_ATOMIC_H */
diff --git a/include/cobalt/asm-blackfin/machine.h 
b/include/cobalt/asm-blackfin/machine.h
index af98ad0..b64b262 100644
--- a/include/cobalt/asm-blackfin/machine.h
+++ b/include/cobalt/asm-blackfin/machine.h
@@ -32,12 +32,6 @@ static inline __attribute_const__ unsigned long 
ffnz(unsigned long ul)
return ffs(ul) - 1;
 }
 
-asmlinkage void __asm_atomic_set_mask(unsigned long *addr,
- unsigned long mask);
-
-asmlinkage void __asm_atomic_clear_mask(unsigned long *addr,
-   unsigned long mask);
-
 #include asm-generic/xenomai/machine.h
 
 #endif /* !_COBALT_ASM_BLACKFIN_MACHINE_H */
diff --git a/include/cobalt/asm-generic/atomic.h 
b/include/cobalt/asm-generic/atomic.h
index 7b44887..a9a7b85 100644
--- a/include/cobalt/asm-generic/atomic.h
+++ b/include/cobalt/asm-generic/atomic.h
@@ -21,28 +21,7 @@
 #ifndef _COBALT_ASM_GENERIC_ATOMIC_H
 #define _COBALT_ASM_GENERIC_ATOMIC_H
 
-#include asm/xenomai/features.h
-
-typedef unsigned long