UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add cmpxchg_local to m68knommu 

Use the new generic cmpxchg_local (disables interrupt). Also use the generic
cmpxchg as fallback if SMP is not set.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mathieu Desnoyers 2008-02-07 00:16:20 -08:00 committed by Linus Torvalds
parent 5da751035c
commit 027bcc27d3
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/asm-m68knommu/system.h
View File

@ -186,26 +186,20 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
} }
#endif #endif
#include <asm-generic/cmpxchg-local.h>
/* /*
* Atomic compare and exchange. Compare OLD with MEM, if identical, * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
* store NEW in MEM. Return the initial value in MEM. Success is * them available.
* indicated by comparing RETURN with OLD.
*/ */
#define __HAVE_ARCH_CMPXCHG 1 #define cmpxchg_local(ptr, o, n) \
((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
static __inline__ unsigned long (unsigned long)(n), sizeof(*(ptr))))
cmpxchg(volatile int *p, int old, int new) #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
{
unsigned long flags;
int prev;
local_irq_save(flags);
if ((prev = *p) == old)
*p = new;
local_irq_restore(flags);
return(prev);
}
#ifndef CONFIG_SMP
#include <asm-generic/cmpxchg.h>
#endif
#if defined( CONFIG_M68328 ) || defined( CONFIG_M68EZ328 ) || \ #if defined( CONFIG_M68328 ) || defined( CONFIG_M68EZ328 ) || \
defined (CONFIG_M68360) || defined( CONFIG_M68VZ328 ) defined (CONFIG_M68360) || defined( CONFIG_M68VZ328 )