diff options
| author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-08-05 14:57:49 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 12:23:07 -0700 |
| commit | 746c28e1af51cc6e7c7c6f7bc7d502f6986713a2 (patch) | |
| tree | 44bae4fcc2a6598002d48b8225c6540be39cb843 /drivers/staging/unisys | |
| parent | 52d13a618aa9b84b8ed8b761ca76cec51701afde (diff) | |
| download | linux-746c28e1af51cc6e7c7c6f7bc7d502f6986713a2.tar.gz linux-746c28e1af51cc6e7c7c6f7bc7d502f6986713a2.tar.bz2 linux-746c28e1af51cc6e7c7c6f7bc7d502f6986713a2.zip | |
staging: unisys: get rid of uiscmpxchg64
Remove the uiscmpxchg64 macro from uisqueue.h and uisqueue.c.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/include/uisqueue.h | 15 | ||||
| -rw-r--r-- | drivers/staging/unisys/uislib/uisqueue.c | 6 |
2 files changed, 2 insertions, 19 deletions
diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h index a2abfa8c82fd..8983407592a9 100644 --- a/drivers/staging/unisys/include/uisqueue.h +++ b/drivers/staging/unisys/include/uisqueue.h @@ -423,19 +423,4 @@ struct guest_msgs { }; -#ifndef __xg -#define __xg(x) ((volatile long *)(x)) -#endif - -/* -* Below code is a copy of Linux kernel's cmpxchg function located at -* this place -* http://tcsxeon:8080/source/xref/00trunk-AppOS-linux/include/asm-x86/cmpxchg_64.h#84 -* Reason for creating our own version of cmpxchg along with -* UISLIB_LOCK_PREFIX is to make the operation atomic even for non SMP -* guests. -*/ - -#define uislibcmpxchg64(p, o, n, s) cmpxchg(p, o, n) - #endif /* __UISQUEUE_H__ */ diff --git a/drivers/staging/unisys/uislib/uisqueue.c b/drivers/staging/unisys/uislib/uisqueue.c index 84eafca5e45c..f52bca1d95b1 100644 --- a/drivers/staging/unisys/uislib/uisqueue.c +++ b/drivers/staging/unisys/uislib/uisqueue.c @@ -43,8 +43,7 @@ uisqueue_InterlockedOr(unsigned long long __iomem *Target, j = readq(Target); do { i = j; - j = uislibcmpxchg64((__force unsigned long long *)Target, - i, i | Set, sizeof(*(Target))); + j = cmpxchg((__force unsigned long long *)Target, i, i | Set); } while (i != j); @@ -62,8 +61,7 @@ uisqueue_InterlockedAnd(unsigned long long __iomem *Target, j = readq(Target); do { i = j; - j = uislibcmpxchg64((__force unsigned long long *)Target, - i, i & Set, sizeof(*(Target))); + j = cmpxchg((__force unsigned long long *)Target, i, i & Set); } while (i != j); |