[PATCH 1/1] define generic version of cmpxchg{64} only if not, previously defined

[PATCH 1/1] define generic version of cmpxchg{64} only if not, previously defined

[Pranith Kumar]

define generic versions of cmpxchg{64} only if not previously defined.

This makes these definition in-line to other definitions of generic versions


Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
 include/asm-generic/cmpxchg.h |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h
index 811fb1e..7154b79 100644
--- a/include/asm-generic/cmpxchg.h
+++ b/include/asm-generic/cmpxchg.h
@@ -102,7 +102,12 @@ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)
 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
 #endif
 
+#ifndef cmpxchg
 #define cmpxchg(ptr, o, n)	cmpxchg_local((ptr), (o), (n))
+#endif
+
+#ifndef cmpxchg64
 #define cmpxchg64(ptr, o, n)	cmpxchg64_local((ptr), (o), (n))
+#endif
 
 #endif /* __ASM_GENERIC_CMPXCHG_H */
-- 
1.7.9.5

Re: [PATCH 1/1] define generic version of cmpxchg{64} only if not, previously defined

[Arnd Bergmann]

On Friday 06 June 2014, Pranith Kumar wrote:
> 
> define generic versions of cmpxchg{64} only if not previously defined.
> 
> This makes these definition in-line to other definitions of generic versions
> 
> 
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

I assume  you have a patch that depends on this. Please queue up this first
patch in the same series as the one that needs it.

	Arnd

Re: [PATCH 1/1] define generic version of cmpxchg{64} only if not, previously defined

[Pranith Kumar]

On 06/11/2014 08:55 AM, Arnd Bergmann wrote:
> On Friday 06 June 2014, Pranith Kumar wrote:
>>
>> define generic versions of cmpxchg{64} only if not previously defined.
>>
>> This makes these definition in-line to other definitions of generic versions
>>
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> I assume  you have a patch that depends on this. Please queue up this first
> patch in the same series as the one that needs it.
> 

This is just a clean up patch and there are no other patches depending on this. I will mark them as such from now on :)

--
Pranith