Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e15a59 authored by David S. Miller's avatar David S. Miller Committed by Greg Kroah-Hartman
Browse files

sparc32: Add cmpxchg64(). 



commit 23198ddf upstream.

This fixes the build with i40e driver enabled.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9aacd823

arch/sparc/include/asm/cmpxchg_32.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,9 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) 
			(unsigned long)_n_, sizeof(*(ptr)));		\

			(unsigned long)_n_, sizeof(*(ptr)));		\

})

})





u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new);

#define cmpxchg64(ptr, old, new)	__cmpxchg_u64(ptr, old, new)



#include <asm-generic/cmpxchg-local.h>

#include <asm-generic/cmpxchg-local.h>





/*

/*

arch/sparc/lib/atomic32.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,20 @@ unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) 
}

}

EXPORT_SYMBOL(__cmpxchg_u32);

EXPORT_SYMBOL(__cmpxchg_u32);





u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new)

{

	unsigned long flags;

	u64 prev;



	spin_lock_irqsave(ATOMIC_HASH(ptr), flags);

	if ((prev = *ptr) == old)

		*ptr = new;

	spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags);



	return prev;

}

EXPORT_SYMBOL(__cmpxchg_u64);



unsigned long __xchg_u32(volatile u32 *ptr, u32 new)

unsigned long __xchg_u32(volatile u32 *ptr, u32 new)

{

{

	unsigned long flags;

	unsigned long flags;