Skip to contentSkip to conversation

Remove tas and split out cmpxchg

PATCH New Jeff Dike 1 participant 1 message May 4, 2007

Subsystems (2)
User-mode Linux (UML) Atomic infrastructure
lore
Share & tools
lore

Jeff Dike

author
#0 lore raw

PATCH 1/1 Remove tas and split out cmpxchg

These are regenerated against your ff tree so as to not lose the cmpxchg changes that you're carrying.

The first one removes tas() from all of the architectures - this comes from the cmpxchg material, so it needs to come first.

The next two split out cmpxchg for i386 and x86_64. The i386 change fixes a missing include in atomic.h and the consequent UML build warnings. The x86_64 is done as tidying in the event that you think it deserves to be split out.

Jeff

Signature · 1 line
Work email - jdike at linux dot intel dot com

tas() has no users, so get rid of it.

Signed-off-by Jeff Dike <[email protected]>

--

 include/asm-alpha/system.h     |    3 ---
 include/asm-arm/system.h       |    2 --
 include/asm-arm26/system.h     |    2 --
 include/asm-h8300/system.h     |    1 -
 include/asm-i386/system.h      |    2 --
 include/asm-m32r/system.h      |    2 --
 include/asm-m68k/system.h      |    1 -
 include/asm-m68knommu/system.h |    1 -
 include/asm-mips/system.h      |    1 -
 include/asm-powerpc/system.h   |    2 --
 include/asm-ppc/system.h       |    1 -
 include/asm-sh/system.h        |   10 ----------
 include/asm-sh64/system.h      |    2 --
 include/asm-sparc/system.h     |    1 -
 include/asm-sparc64/system.h   |    1 -
 include/asm-v850/system.h      |    1 -
 include/asm-x86_64/system.h    |    2 --
 include/asm-xtensa/system.h    |    2 --
 18 files changed, 37 deletions(-)
include/asm-alpha/system.h +0 -3
Index: linux-2.6/include/asm-alpha/system.h
===================================================================
@@ -443,9 +443,6 @@ extern void __xchg_called_with_bad_point
      (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr))); \
   })
 
-#define tas(ptr) (xchg((ptr),1))
-
-
 /* 
  * Atomic compare and exchange.  Compare OLD with MEM, if identical,
  * store NEW in MEM.  Return the initial value in MEM.  Success is
include/asm-arm/system.h +0 -2
Index: linux-2.6/include/asm-arm/system.h
===================================================================
@@ -101,8 +101,6 @@ void hook_fault_code(int nr, int (*fn)(u
 #define xchg(ptr,x) \
 	((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
-
 extern asmlinkage void __backtrace(void);
 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
include/asm-arm26/system.h +0 -2
Index: linux-2.6/include/asm-arm26/system.h
===================================================================
@@ -52,8 +52,6 @@ void hook_fault_code(int nr, int (*fn)(u
 #define xchg(ptr,x) \
 	((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
-
 extern asmlinkage void __backtrace(void);
 
 #define set_cr(x)					\
include/asm-h8300/system.h +0 -1
Index: linux-2.6/include/asm-h8300/system.h
===================================================================
@@ -98,7 +98,6 @@ asmlinkage void resume(void);
 #endif
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((volatile struct __xchg_dummy *)(x))
include/asm-i386/system.h +0 -2
Index: linux-2.6/include/asm-i386/system.h
===================================================================
@@ -197,8 +197,6 @@ static inline unsigned long get_limit(un
 
 #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
-
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))
include/asm-m32r/system.h +0 -2
Index: linux-2.6/include/asm-m32r/system.h
===================================================================
@@ -122,8 +122,6 @@ static inline void local_irq_disable(voi
 #define xchg(ptr,x) \
 	((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr)	(xchg((ptr),1))
-
 #ifdef CONFIG_SMP
 extern void  __xchg_called_with_bad_pointer(void);
 #endif
include/asm-m68k/system.h +0 -1
Index: linux-2.6/include/asm-m68k/system.h
===================================================================
@@ -88,7 +88,6 @@ static inline int irqs_disabled(void)
 
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((volatile struct __xchg_dummy *)(x))
include/asm-m68knommu/system.h +0 -1
Index: linux-2.6/include/asm-m68knommu/system.h
===================================================================
@@ -120,7 +120,6 @@ asmlinkage void resume(void);
 #endif
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((volatile struct __xchg_dummy *)(x))
include/asm-mips/system.h +0 -1
Index: linux-2.6/include/asm-mips/system.h
===================================================================
@@ -201,7 +201,6 @@ static inline unsigned long __xchg(unsig
 }
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 #define __HAVE_ARCH_CMPXCHG 1
include/asm-powerpc/system.h +0 -2
Index: linux-2.6/include/asm-powerpc/system.h
===================================================================
@@ -275,8 +275,6 @@ __xchg(volatile void *ptr, unsigned long
      (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr))); \
   })
 
-#define tas(ptr) (xchg((ptr),1))
-
 /*
  * Compare and exchange - if *p == old, set it to new,
  * and return the old value of *p.
include/asm-ppc/system.h +0 -1
Index: linux-2.6/include/asm-ppc/system.h
===================================================================
@@ -170,7 +170,6 @@ xchg_u32(volatile void *p, unsigned long
 extern void __xchg_called_with_bad_pointer(void);
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 {
include/asm-sh/system.h +0 -10
Index: linux-2.6/include/asm-sh/system.h
===================================================================
@@ -81,16 +81,6 @@ static inline void sched_cacheflush(void
 }
 #endif
 
-static inline unsigned long tas(volatile int *m)
-{
-	unsigned long retval;
-
-	__asm__ __volatile__ ("tas.b	@%1\n\t"
-			      "movt	%0"
-			      : "=r" (retval): "r" (m): "t", "memory");
-	return retval;
-}
-
 /*
  * A brief note on ctrl_barrier(), the control register write barrier.
  *
include/asm-sh64/system.h +0 -2
Index: linux-2.6/include/asm-sh64/system.h
===================================================================
@@ -43,8 +43,6 @@ extern struct task_struct *sh64_switch_t
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr), 1))
-
 extern void __xchg_called_with_bad_pointer(void);
 
 #define mb()	__asm__ __volatile__ ("synco": : :"memory")
include/asm-sparc/system.h +0 -1
Index: linux-2.6/include/asm-sparc/system.h
===================================================================
@@ -241,7 +241,6 @@ static inline unsigned long xchg_u32(__v
 }
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 extern void __xchg_called_with_bad_pointer(void);
include/asm-sparc64/system.h +0 -1
Index: linux-2.6/include/asm-sparc64/system.h
===================================================================
@@ -253,7 +253,6 @@ static inline unsigned long xchg64(__vol
 }
 
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-#define tas(ptr) (xchg((ptr),1))
 
 extern void __xchg_called_with_bad_pointer(void);
include/asm-v850/system.h +0 -1
Index: linux-2.6/include/asm-v850/system.h
===================================================================
@@ -76,7 +76,6 @@ static inline int irqs_disabled (void)
 
 #define xchg(ptr, with) \
   ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
-#define tas(ptr) (xchg ((ptr), 1))
 
 static inline unsigned long __xchg (unsigned long with,
 				    __volatile__ void *ptr, int size)
include/asm-x86_64/system.h +0 -2
Index: linux-2.6/include/asm-x86_64/system.h
===================================================================
@@ -126,8 +126,6 @@ static inline void sched_cacheflush(void
 
 #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
-
 #define __xg(x) ((volatile long *)(x))
 
 static inline void set_64bit(volatile unsigned long *ptr, unsigned long val)
include/asm-xtensa/system.h +0 -2
Index: linux-2.6/include/asm-xtensa/system.h
===================================================================
@@ -183,8 +183,6 @@ static inline unsigned long xchg_u32(vol
   return tmp;
 }
 
-#define tas(ptr) (xchg((ptr),1))
-
 #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
 /*

Rearrange the i386 cmpxchg code to allow atomic.h to get it without needing to include system.h. This kills warnings in the UML build from atomic.h about implicit declarations of cmpxchg symbols.

The cmpxchg stuff is moved to asm-i386/cmpxchg.h, with an include left in system.h for the benefit of generic code which expects cmpxchg there.

Meanwhile, atomic.h includes cmpxchg.h.

Signed-off-by Jeff Dike <[email protected]>

--

 include/asm-i386/atomic.h  |    1 
 include/asm-i386/cmpxchg.h |  236 +++++++++++++++++++++++++++++++++++++++++++++
 include/asm-i386/system.h  |  232 --------------------------------------------
 3 files changed, 238 insertions(+), 231 deletions(-)
include/asm-i386/atomic.h +1 -0
Index: linux-2.6/include/asm-i386/atomic.h
===================================================================
@@ -3,6 +3,7 @@
 
 #include <linux/compiler.h>
 #include <asm/processor.h>
+#include <asm/cmpxchg.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for
include/asm-i386/cmpxchg.h new file +236 -0

236 lines not on this page · raw message

include/asm-i386/system.h +1 -231

244 lines not on this page · raw message

This is the x86_64 movement of cmpxchg into its own header. atomic.h already included system.h, so this is changed to include cmpxchg.h.

Signed-off-by Jeff Dike <[email protected]>

--

 include/asm-x86_64/atomic.h  |    1 
 include/asm-x86_64/cmpxchg.h |   98 +++++++++++++++++++++++++++++++++++++++++++
 include/asm-x86_64/system.h  |   94 -----------------------------------------
 3 files changed, 100 insertions(+), 93 deletions(-)
include/asm-x86_64/atomic.h +1 -0
Index: linux-2.6/include/asm-x86_64/atomic.h
===================================================================
@@ -2,6 +2,7 @@
 #define __ARCH_X86_64_ATOMIC__
 
 #include <asm/alternative.h>
+#include <asm/cmpxchg.h>
 
 /* atomic_t should be 32 bit signed type */
include/asm-x86_64/cmpxchg.h new file +98 -0

98 lines not on this page · raw message

include/asm-x86_64/system.h +1 -93

106 lines not on this page · raw message

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel